Index: browser-plugin/totem-plugin-viewer.c
===================================================================
--- browser-plugin/totem-plugin-viewer.c	(revision 4426)
+++ browser-plugin/totem-plugin-viewer.c	(working copy)
@@ -31,7 +31,6 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <gconf/gconf-client.h>
 
 #define SN_API_NOT_YET_FROZEN
@@ -96,7 +95,7 @@
 	GObject parent;
 
 	GtkWidget *window;
-	GladeXML *menuxml, *xml;
+	GtkBuilder *menuxml, *xml;
 	GtkWidget *about;
 	GtkWidget *pp_button;
 	TotemStatusbar *statusbar;
@@ -1005,7 +1004,8 @@
 static void
 totem_embedded_update_menu (TotemEmbedded *emb)
 {
-	GtkWidget *menu, *item, *image;
+	GtkWidget *item, *image;
+	GtkMenuShell *menu;
 	char *label;
 
 	if (emb->menu_item != NULL) {
@@ -1051,8 +1051,8 @@
 	gtk_widget_show (item);
 	emb->menu_item = item;
 
-	menu = glade_xml_get_widget (emb->menuxml, "menu");
-	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+	menu = GTK_MENU_SHELL (gtk_builder_get_object (emb->menuxml, "menu"));
+	gtk_menu_shell_prepend (menu, item);
 }
 
 static void
@@ -1216,7 +1216,7 @@
 		   state == 0) {
 		GtkMenu *menu;
 
-		menu = GTK_MENU (glade_xml_get_widget (emb->menuxml, "menu"));
+		menu = GTK_MENU (gtk_builder_get_object (emb->menuxml, "menu"));
 		gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
 				event->button, event->time);
 
@@ -1362,22 +1362,20 @@
 		/* Can't do anything before it's realized */
 		gtk_widget_realize (emb->window);
 
-		emb->xml = totem_interface_load_with_root ("mozilla-viewer.glade",
-				"content_box", _("Plugin") /* FIXME! */, TRUE,
-				GTK_WINDOW (emb->window));
+		emb->xml = totem_interface_load ("mozilla-viewer.glade", TRUE,
+				GTK_WINDOW (emb->window), emb);
 		g_assert (emb->xml);
 
-		child = glade_xml_get_widget (emb->xml, "content_box");
+		child = GTK_WIDGET (gtk_builder_get_object (emb->xml, "content_box"));
 		gtk_container_add (GTK_CONTAINER (emb->window), child);
 	} else {
 		g_assert (emb->hidden);
 
-		emb->xml = totem_interface_load_with_root ("mozilla-viewer.glade",
-				"window", _("Plugin") /* FIXME! */, TRUE,
-				GTK_WINDOW (emb->window));
+		emb->xml = totem_interface_load ("mozilla-viewer.glade", TRUE,
+				GTK_WINDOW (emb->window), emb);
 		g_assert (emb->xml);
 
-		emb->window = glade_xml_get_widget (emb->xml, "window");
+		emb->window = GTK_WIDGET (gtk_builder_get_object (emb->xml, "window"));
 	}
 
 	if (emb->hidden || emb->audioonly != FALSE)
@@ -1415,7 +1413,7 @@
 	g_signal_connect (G_OBJECT(emb->bvw), "tick",
 			G_CALLBACK (on_tick), emb);
 
-	container = glade_xml_get_widget (emb->xml, "video_box");
+	container = GTK_WIDGET (gtk_builder_get_object (emb->xml, "video_box"));
 	if (type == BVW_USE_TYPE_VIDEO) {
 		gtk_container_add (GTK_CONTAINER (container), GTK_WIDGET (emb->bvw));
 		/* FIXME: why can't this wait until the whole window is realised? */
@@ -1426,14 +1424,14 @@
 		gtk_widget_hide (container);
 	}
 
-	emb->seek = glade_xml_get_widget (emb->xml, "time_hscale");
+	emb->seek = GTK_WIDGET (gtk_builder_get_object (emb->xml, "time_hscale"));
 	emb->seekadj = gtk_range_get_adjustment (GTK_RANGE (emb->seek));
 	g_signal_connect (emb->seek, "button-press-event",
 			  G_CALLBACK (on_seek_start), emb);
 	g_signal_connect (emb->seek, "button-release-event",
 			  G_CALLBACK (cb_on_seek), emb);
 
-	emb->pp_button = glade_xml_get_widget (emb->xml, "pp_button");
+	emb->pp_button = GTK_WIDGET (gtk_builder_get_object (emb->xml, "pp_button"));
 	g_signal_connect (G_OBJECT (emb->pp_button), "clicked",
 			  G_CALLBACK (on_play_pause), emb);
 
@@ -1442,27 +1440,27 @@
 	g_object_unref (G_OBJECT (gc));
 
 	bacon_video_widget_set_volume (emb->bvw, volume);
-	vbut = glade_xml_get_widget (emb->xml, "volume_button");
+	vbut = GTK_WIDGET (gtk_builder_get_object (emb->xml, "volume_button"));
 	gtk_scale_button_set_value (GTK_SCALE_BUTTON (vbut), volume);
 	g_signal_connect (G_OBJECT (vbut), "value-changed",
 			  G_CALLBACK (cb_vol), emb);
 
-	emb->statusbar = TOTEM_STATUSBAR (glade_xml_get_widget (emb->xml, "statusbar"));
+	emb->statusbar = TOTEM_STATUSBAR (gtk_builder_get_object (emb->xml, "statusbar"));
 
 	gtk_widget_set_size_request (emb->window, width, height);
 
 #ifdef GNOME_ENABLE_DEBUG
-	child = glade_xml_get_widget (emb->xml, "controls");
-	g_signal_connect_after (child, "size-allocate", G_CALLBACK (controls_size_allocate_cb), NULL);
+	child = GTK_WIDGET (gtk_builder_get_object (emb->xml, "controls"));
+	g_signal_connect_after (G_OBJECT (child), "size-allocate", G_CALLBACK (controls_size_allocate_cb), NULL);
 #endif
 
 	if (emb->controller_hidden != FALSE) {
-		child = glade_xml_get_widget (emb->xml, "controls");
+		child = GTK_WIDGET (gtk_builder_get_object (emb->xml, "controls"));
 		gtk_widget_hide (child);
 	}
 
 	if (!emb->show_statusbar) {
-		child = glade_xml_get_widget (emb->xml, "statusbar");
+		child = GTK_WIDGET (gtk_builder_get_object (emb->xml, "statusbar"));
 		gtk_widget_hide (child);
 	}
 
@@ -1475,10 +1473,10 @@
 
 		gtk_widget_modify_style (emb->pp_button, rcstyle);
 		
-		child = glade_xml_get_widget (emb->xml, "time_hscale");
+		child = GTK_WIDGET (gtk_builder_get_object (emb->xml, "time_hscale"));
 		gtk_widget_modify_style (child, rcstyle);
 
-		child = glade_xml_get_widget (emb->xml, "volume_button");
+		child = GTK_WIDGET (gtk_builder_get_object (emb->xml, "volume_button"));
 		gtk_widget_modify_style (child, rcstyle);
 
 		g_object_unref (rcstyle);
@@ -1491,18 +1489,17 @@
 	}
 
 	/* popup */
-	emb->menuxml = totem_interface_load_with_root ("mozilla-viewer.glade",
-			"menu", _("Menu"), TRUE,
-			GTK_WINDOW (emb->window));
+	emb->menuxml = totem_interface_load ("mozilla-viewer.glade", TRUE,
+				GTK_WINDOW (emb->window), emb);
 	g_assert (emb->menuxml);
 
-	child = glade_xml_get_widget (emb->menuxml, "about1");
+	child = GTK_WIDGET (gtk_builder_get_object (emb->menuxml, "about1"));
 	g_signal_connect (G_OBJECT (child), "activate",
 			  G_CALLBACK (on_about1_activate), emb);
-	child = glade_xml_get_widget (emb->menuxml, "copy_location1");
+	child = GTK_WIDGET (gtk_builder_get_object (emb->menuxml, "copy_location1"));
 	g_signal_connect (G_OBJECT (child), "activate",
 			G_CALLBACK (on_copy_location1_activate), emb);
-	child = glade_xml_get_widget (emb->menuxml, "preferences1");
+	child = GTK_WIDGET (gtk_builder_get_object (emb->menuxml, "preferences1"));
 	gtk_widget_hide (child);
 
 	/* Create cursor and set the logo */
Index: configure.in
===================================================================
--- configure.in	(revision 4426)
+++ configure.in	(working copy)
@@ -258,11 +258,11 @@
 dnl Also check if we're going to be using GTK+ only
 if test x$ENABLE_GTK = "xno" ; then
 # FIXME: use gmodule-no-export instead!
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM)
+	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM)
 	HAVE_GNOME=yes
 else
 # FIXME: use gmodule-no-export instead!
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libglade-2.0 gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM)
+	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM)
 	AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
 	AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
 	HAVE_GNOME=no
Index: src/totem-sidebar.c
===================================================================
--- src/totem-sidebar.c	(revision 4426)
+++ src/totem-sidebar.c	(working copy)
@@ -41,8 +41,8 @@
 	h = totem->win->allocation.height;
 
 	g_value_init (&gvalue_size, G_TYPE_INT);
-	pane = glade_xml_get_widget (totem->xml, "tmw_main_pane");
-	gtk_widget_style_get_property(pane, "handle-size", &gvalue_size);
+	pane = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_main_pane"));
+	gtk_widget_style_get_property (pane, "handle-size", &gvalue_size);
 	handle_size = g_value_get_int (&gvalue_size);
 	
 	if (totem->sidebar_shown) {
@@ -96,10 +96,10 @@
 void
 totem_sidebar_setup (Totem *totem, gboolean visible, const char *page_id)
 {
-	GtkWidget *item;
+	GtkPaned *item;
 	GtkAction *action;
 
-	item = glade_xml_get_widget (totem->xml, "tmw_main_pane");
+	item = GTK_PANED (gtk_builder_get_object (totem->xml, "tmw_main_pane"));
 	totem->sidebar = ev_sidebar_new ();
 	ev_sidebar_add_page (EV_SIDEBAR (totem->sidebar),
 			"playlist", _("Playlist"),
@@ -111,7 +111,7 @@
 		ev_sidebar_set_current_page (EV_SIDEBAR (totem->sidebar),
 				"playlist");
 	}
-	gtk_paned_pack2 (GTK_PANED (item), totem->sidebar, FALSE, FALSE);
+	gtk_paned_pack2 (item, totem->sidebar, FALSE, FALSE);
 
 	totem->sidebar_shown = visible;
 
Index: src/totem-screenshot.c
===================================================================
--- src/totem-screenshot.c	(revision 4426)
+++ src/totem-screenshot.c	(working copy)
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <gconf/gconf-client.h>
 #include <string.h>
 #include <sys/types.h>
Index: src/totem-private.h
===================================================================
--- src/totem-private.h	(revision 4426)
+++ src/totem-private.h	(working copy)
@@ -28,25 +28,24 @@
 #ifndef __TOTEM_PRIVATE_H__
 #define __TOTEM_PRIVATE_H__
 
-#include <glade/glade.h>
 #include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs.h>
 
 #include "totem-playlist.h"
-#include "totem-fullscreen.h"
 #include "bacon-message-connection.h"
 #include "bacon-video-widget.h"
 #include "totem-open-location.h"
+#include "totem-fullscreen.h"
 
 #define totem_signal_block_by_data(obj, data) (g_signal_handlers_block_matched (obj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data))
 #define totem_signal_unblock_by_data(obj, data) (g_signal_handlers_unblock_matched (obj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data))
 
-#define totem_set_sensitivity(xml, name, state)		\
-	{							\
-		GtkWidget *widget;				\
-		widget = glade_xml_get_widget (xml, name);	\
-		gtk_widget_set_sensitive (widget, state);	\
+#define totem_set_sensitivity(xml, name, state)					\
+	{									\
+		GtkWidget *widget;						\
+		widget = GTK_WIDGET (gtk_builder_get_object (xml, name));	\
+		gtk_widget_set_sensitive (widget, state);			\
 	}
 #define totem_main_set_sensitivity(name, state) totem_set_sensitivity (totem->xml, name, state)
 
@@ -74,7 +73,7 @@
 	GObject parent;
 
 	/* Control window */
-	GladeXML *xml;
+	GtkBuilder *xml;
 	GtkWidget *win;
 	BaconVideoWidget *bvw;
 	GtkWidget *prefs;
Index: src/totem-menu.c
===================================================================
--- src/totem-menu.c	(revision 4426)
+++ src/totem-menu.c	(working copy)
@@ -24,7 +24,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 #include <string.h>
 
 #include "totem-menu.h"
@@ -1322,7 +1321,7 @@
 {
 	char *filename;
 	GtkWidget *menubar;
-	GtkWidget *menubar_box;
+	GtkBox *menubar_box;
 	GtkAction *action;
 
 	totem->main_action_group = gtk_action_group_new ("main-action-group");
@@ -1404,7 +1403,7 @@
 	g_free (filename);
 
 	menubar = gtk_ui_manager_get_widget (totem->ui_manager, "/tmw-menubar");
-	menubar_box = glade_xml_get_widget (totem->xml, "tmw_menubar_box");
-	gtk_box_pack_start (GTK_BOX (menubar_box), menubar, FALSE, FALSE, 0);
+	menubar_box = GTK_BOX (gtk_builder_get_object (totem->xml, "tmw_menubar_box"));
+	gtk_box_pack_start (menubar_box, menubar, FALSE, FALSE, 0);
 }
 
Index: src/totem-statusbar.c
===================================================================
--- src/totem-statusbar.c	(revision 4426)
+++ src/totem-statusbar.c	(working copy)
@@ -117,19 +117,6 @@
   return g_object_new (TOTEM_TYPE_STATUSBAR, NULL);
 }
 
-GtkWidget *
-totem_statusbar_new_from_glade (gchar *widget_name,
-		gchar *string1, gchar *string2,
-		gint int1, gint int2)
-{
-  GtkWidget *widget;
-
-  widget = totem_statusbar_new ();
-  gtk_widget_show (widget);
-
-  return widget;
-}
-
 static void
 totem_statusbar_update_time (TotemStatusbar *statusbar)
 {
Index: src/plugins/properties/bacon-video-widget-properties.c
===================================================================
--- src/plugins/properties/bacon-video-widget-properties.c	(revision 4426)
+++ src/plugins/properties/bacon-video-widget-properties.c	(working copy)
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 #include <string.h>
 #include "video-utils.h"
 #include "totem-interface.h"
@@ -80,7 +79,7 @@
 
 struct BaconVideoWidgetPropertiesPrivate
 {
-	GladeXML *xml;
+	GtkBuilder *xml;
 	int time;
 };
 
@@ -118,10 +117,10 @@
 bacon_video_widget_properties_set_label (BaconVideoWidgetProperties *props,
 			       const char *name, const char *text)
 {
-	GtkWidget *item;
+	GtkLabel *item;
 
-	item = glade_xml_get_widget (props->priv->xml, name);
-	gtk_label_set_text (GTK_LABEL (item), text);
+	item = GTK_LABEL (gtk_builder_get_object (props->priv->xml, name));
+	gtk_label_set_text (item, text);
 }
 
 void
@@ -132,11 +131,11 @@
 	g_return_if_fail (props != NULL);
 	g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
 
-	item = glade_xml_get_widget (props->priv->xml, "video_vbox");
+	item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video_vbox"));
 	gtk_widget_show (item);
-	item = glade_xml_get_widget (props->priv->xml, "video");
+	item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video"));
 	gtk_widget_set_sensitive (item, FALSE);
-	item = glade_xml_get_widget (props->priv->xml, "audio");
+	item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "audio"));
 	gtk_widget_set_sensitive (item, FALSE);
 
 	/* Title */
@@ -220,14 +219,14 @@
 	g_value_unset (&value);
 
 	/* Video */
-	item = glade_xml_get_widget (props->priv->xml, "video");
+	item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video"));
 	bacon_video_widget_get_metadata (BACON_VIDEO_WIDGET (bvw),
 			BVW_INFO_HAS_VIDEO, &value);
 	has_type = g_value_get_boolean (&value);
 	gtk_widget_set_sensitive (item, has_type);
 	g_value_unset (&value);
 
-	item = glade_xml_get_widget (props->priv->xml, "video_vbox");
+	item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "video_vbox"));
 
 	if (has_type != FALSE)
 	{
@@ -244,7 +243,7 @@
 	}
 
 	/* Audio */
-	item = glade_xml_get_widget (props->priv->xml, "audio");
+	item = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "audio"));
 	bacon_video_widget_get_metadata (BACON_VIDEO_WIDGET (bvw),
 			BVW_INFO_HAS_AUDIO, &value);
 	has_type = g_value_get_boolean (&value);
@@ -287,7 +286,7 @@
 bacon_video_widget_properties_new (void)
 {
 	BaconVideoWidgetProperties *props;
-	GladeXML *xml;
+	GtkBuilder *xml;
 	GtkWidget *vbox;
 	GtkSizeGroup *group;
 	const char *labels[] = { "title_label", "artist_label", "album_label",
@@ -302,8 +301,7 @@
 	};
 	guint i;
 
-	xml = totem_interface_load_with_root ("properties.glade",
-			"vbox1", _("Properties dialog"), TRUE, NULL);
+	xml = totem_interface_load ("properties.ui", TRUE, NULL, NULL);
 
 	if (xml == NULL)
 		return NULL;
@@ -312,7 +310,7 @@
 			(BACON_TYPE_VIDEO_WIDGET_PROPERTIES, NULL));
 
 	props->priv->xml = xml;
-	vbox = glade_xml_get_widget (props->priv->xml, "vbox1");
+	vbox = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "vbox1"));
 	gtk_box_pack_start (GTK_BOX (props), vbox, FALSE, FALSE, 0);
 
 	bacon_video_widget_properties_reset (props);
@@ -321,7 +319,7 @@
 
 	for (i = 0; i < G_N_ELEMENTS (labels); i++) {
 		gtk_size_group_add_widget (group,
-					   glade_xml_get_widget (xml, labels[i]));
+					   GTK_WIDGET (gtk_builder_get_object (xml, labels[i])));
 		totem_interface_italicise_label (xml, labels[i]);
 	}
 	for (i = 0; i < G_N_ELEMENTS (bold_labels); i++)
Index: src/plugins/skipto/totem-skipto.c
===================================================================
--- src/plugins/skipto/totem-skipto.c	(revision 4426)
+++ src/plugins/skipto/totem-skipto.c	(working copy)
@@ -31,7 +31,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 #include <gconf/gconf-client.h>
 #include <string.h>
 #include <sys/types.h>
@@ -50,8 +49,12 @@
 static void totem_skipto_init		(TotemSkipto *ggo);
 static void totem_skipto_finalize	(GObject *object);
 
+/* Callback functions for GtkBuilder */
+void spin_button_activate_cb (GtkEntry *entry, TotemSkipto *skipto);
+void spin_button_value_changed_cb (GtkSpinButton *spinbutton, TotemSkipto *skipto);
+
 struct TotemSkiptoPrivate {
-	GladeXML *xml;
+	GtkBuilder *xml;
 	GtkWidget *label;
 	GtkWidget *spinbutton;
 	gint64 time;
@@ -140,13 +143,13 @@
 			(gdouble) (time / 1000));
 }
 
-static void
+void
 spin_button_activate_cb (GtkEntry *entry, TotemSkipto *skipto)
 {
 	gtk_dialog_response (GTK_DIALOG (skipto), GTK_RESPONSE_OK);
 }
 
-static void
+void
 spin_button_value_changed_cb (GtkSpinButton *spinbutton, TotemSkipto *skipto)
 {
 	int sec;
@@ -159,27 +162,28 @@
 }
 
 GtkWidget*
-totem_skipto_new (const char *glade_filename, Totem *totem)
+totem_skipto_new (const char *builder_filename, Totem *totem)
 {
 	TotemSkipto *skipto;
 	GtkWidget *container;
+	GError *error = NULL;
 
-	g_return_val_if_fail (glade_filename != NULL, NULL);
+	g_return_val_if_fail (builder_filename != NULL, NULL);
 
 	skipto = TOTEM_SKIPTO (g_object_new (TOTEM_TYPE_SKIPTO, NULL));
 
 	skipto->priv->totem = totem;
-	skipto->priv->xml = glade_xml_new (glade_filename,
-					   "tstw_skip_vbox", NULL);
+	skipto->priv->xml = gtk_builder_new ();
+	gtk_builder_add_from_file (skipto->priv->xml, builder_filename, &error);
 
 	if (skipto->priv->xml == NULL) {
 		g_object_unref (skipto);
 		return NULL;
 	}
-	skipto->priv->label = glade_xml_get_widget
-		(skipto->priv->xml, "tstw_position_label");
-	skipto->priv->spinbutton = glade_xml_get_widget
-		(skipto->priv->xml, "tstw_skip_spinbutton");
+	skipto->priv->label = GTK_WIDGET (gtk_builder_get_object
+		(skipto->priv->xml, "tstw_position_label"));
+	skipto->priv->spinbutton = GTK_WIDGET (gtk_builder_get_object
+		(skipto->priv->xml, "tstw_skip_spinbutton"));
 
 	gtk_window_set_title (GTK_WINDOW (skipto), _("Skip to"));
 	gtk_dialog_set_has_separator (GTK_DIALOG (skipto), FALSE);
@@ -189,15 +193,11 @@
 			NULL);
 
 	/* Skipto dialog */
-	g_signal_connect (G_OBJECT (skipto->priv->spinbutton), "value-changed",
-			G_CALLBACK (spin_button_value_changed_cb), skipto);
-	g_signal_connect_after (G_OBJECT (skipto->priv->spinbutton), "activate",
-			G_CALLBACK (spin_button_activate_cb), skipto);
 	g_signal_connect (G_OBJECT (skipto), "delete-event",
 			G_CALLBACK (gtk_widget_destroy), skipto);
 
-	container = glade_xml_get_widget (skipto->priv->xml,
-			"tstw_skip_vbox");
+	container = GTK_WIDGET (gtk_builder_get_object (skipto->priv->xml,
+			"tstw_skip_vbox"));
 	gtk_container_set_border_width (GTK_CONTAINER (skipto), 5);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (skipto)->vbox),
 			container,
Index: src/plugins/skipto/skip_to.glade
===================================================================
--- src/plugins/skipto/skip_to.glade	(revision 4426)
+++ src/plugins/skipto/skip_to.glade	(working copy)
@@ -1,207 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="totem_skipto_window">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Skip to</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="tstw_dialog_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="tstw_dialog_action_area">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="tstw_cancel_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="tstw_ok_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="tstw_skip_vbox">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="tstw_skip_hbox">
-	      <property name="border_width">4</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="tstw_skip_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Skip to:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">tstw_skip_spinbutton</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox13">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="tstw_skip_spinbutton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">0 0 0 1 10 10</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="tstw_seconds_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">seconds</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="tstw_position_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">0 seconds</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
Index: src/plugins/skipto/skipto.ui
===================================================================
--- src/plugins/skipto/skipto.ui	(revision 0)
+++ src/plugins/skipto/skipto.ui	(revision 0)
@@ -0,0 +1,144 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+
+<object class="GtkVBox" id="tstw_skip_vbox">
+  <property name="border_width">5</property>
+  <property name="visible">True</property>
+  <property name="homogeneous">False</property>
+  <property name="spacing">6</property>
+
+  <child>
+    <object class="GtkHBox" id="tstw_skip_hbox">
+      <property name="border_width">4</property>
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">12</property>
+
+      <child>
+	<object class="GtkLabel" id="tstw_skip_label">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">_Skip to:</property>
+	  <property name="use_underline">True</property>
+	  <property name="use_markup">False</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	  <property name="mnemonic_widget">tstw_skip_spinbutton</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkHBox" id="hbox13">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">6</property>
+
+	  <child>
+	    <object class="GtkAdjustment" id="tstw_skip_adjustment">
+	      <property name="lower">0</property>
+              <property name="upper">0</property>
+              <property name="step-increment">1</property>
+              <property name="page-increment">10</property>
+              <property name="page-size">10</property>
+              <property name="value">0</property>
+	    </object>
+	    <object class="GtkSpinButton" id="tstw_skip_spinbutton">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="climb_rate">1</property>
+	      <property name="digits">0</property>
+	      <property name="numeric">False</property>
+	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+	      <property name="snap_to_ticks">False</property>
+	      <property name="wrap">False</property>
+	      <property name="adjustment">tstw_skip_adjustment</property>
+	      <signal name="value-changed" handler="spin_button_value_changed_cb"/>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <object class="GtkLabel" id="tstw_seconds_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">seconds</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">False</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+
+  <child>
+    <object class="GtkLabel" id="tstw_position_label">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">0 seconds</property>
+      <property name="use_underline">False</property>
+      <property name="use_markup">False</property>
+      <property name="justify">GTK_JUSTIFY_LEFT</property>
+      <property name="wrap">False</property>
+      <property name="selectable">False</property>
+      <property name="xalign">0.5</property>
+      <property name="yalign">0.5</property>
+      <property name="xpad">0</property>
+      <property name="ypad">0</property>
+      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+      <property name="width_chars">-1</property>
+      <property name="single_line_mode">False</property>
+      <property name="angle">0</property>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">False</property>
+      <property name="fill">False</property>
+    </packing>
+  </child>
+</object>
+
+</interface>
Index: src/plugins/skipto/Makefile.am
===================================================================
--- src/plugins/skipto/Makefile.am	(revision 4426)
+++ src/plugins/skipto/Makefile.am	(working copy)
@@ -1,7 +1,7 @@
 modules_flags = -export_dynamic -avoid-version -module
 
 plugindir = $(PLUGINDIR)/skipto
-gladedir = $(plugindir)
+uidir = $(plugindir)
 plugin_LTLIBRARIES = libskipto.la
 
 plugin_in_files = skipto.totem-plugin.in
@@ -9,7 +9,7 @@
 %.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-glade_DATA = skip_to.glade
+ui_DATA = skipto.ui
 
 common_defines = \
 	-D_REENTRANT					\
@@ -41,7 +41,7 @@
 	-I$(top_srcdir)/src	\
 	-I$(top_srcdir)/src/plugins
 
-EXTRA_DIST = $(plugin_in_files) $(glade_DATA)
+EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
 
 CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
 DISTCLEANFILES = $(plugin_DATA)
Index: src/plugins/skipto/totem-skipto-plugin.c
===================================================================
--- src/plugins/skipto/totem-skipto-plugin.c	(revision 4426)
+++ src/plugins/skipto/totem-skipto-plugin.c	(working copy)
@@ -162,7 +162,7 @@
 static void
 run_skip_to_dialog (TotemSkiptoPlugin *plugin)
 {
-	char *glade_path;
+	char *builder_path;
 
 	if (totem_is_seekable (plugin->totem) == FALSE)
 		return;
@@ -173,9 +173,9 @@
 		return;
 	}
 
-	glade_path = totem_plugin_find_file (TOTEM_PLUGIN (plugin), "skip_to.glade");
-	plugin->st = TOTEM_SKIPTO (totem_skipto_new (glade_path, plugin->totem));
-	g_free (glade_path);
+	builder_path = totem_plugin_find_file (TOTEM_PLUGIN (plugin), "skipto.ui");
+	plugin->st = TOTEM_SKIPTO (totem_skipto_new (builder_path, plugin->totem));
+	g_free (builder_path);
 	g_signal_connect (G_OBJECT (plugin->st), "delete-event",
 				G_CALLBACK (gtk_widget_destroy), NULL);
 	g_signal_connect (G_OBJECT (plugin->st), "response",
@@ -223,18 +223,18 @@
 	GtkWindow *window;
 	GtkUIManager *manager;
 	TotemSkiptoPlugin *pi = TOTEM_SKIPTO_PLUGIN (plugin);
-	char *glade_path;
+	char *builder_path;
 	const GtkActionEntry menu_entries[] = {
 		{ "skip-to", GTK_STOCK_JUMP_TO, N_("_Skip to..."), "s", N_("Skip to a specific time"), G_CALLBACK (skip_to_action_callback) }
 	};
 
-	glade_path = totem_plugin_find_file (TOTEM_PLUGIN (plugin), "skip_to.glade");
-	if (glade_path == NULL) {
+	builder_path = totem_plugin_find_file (TOTEM_PLUGIN (plugin), "skip_to.glade");
+	if (builder_path == NULL) {
 		g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
 				_("Could not load the \"Skip to\" dialogue interface."));
 		return FALSE;
 	}
-	g_free (glade_path);
+	g_free (builder_path);
 
 	pi->totem = totem;
 	pi->handler_id_stream_length = g_signal_connect (G_OBJECT (totem),
Index: src/plugins/totem-plugin-manager.c
===================================================================
--- src/plugins/totem-plugin-manager.c	(revision 4426)
+++ src/plugins/totem-plugin-manager.c	(working copy)
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <glade/glade-xml.h>
+#include <gtk/gtk.h>
 
 #include "totem-interface.h"
 #include "totem-plugin-manager.h"
@@ -80,6 +80,9 @@
 static void plugin_manager_toggle_active (GtkTreeIter *iter, GtkTreeModel *model, TotemPluginManager *pm);
 static void plugin_manager_toggle_all (TotemPluginManager *pm);
 
+/* Callback functions for GtkBuilder */
+void configure_button_cb (GtkWidget *button, TotemPluginManager *pm);
+
 static void
 totem_plugin_manager_class_init (TotemPluginManagerClass *klass)
 {
@@ -90,7 +93,7 @@
 	g_type_class_add_private (object_class, sizeof (TotemPluginManagerPrivate));
 }
 
-static void
+void
 configure_button_cb (GtkWidget          *button,
 		     TotemPluginManager *pm)
 {
@@ -481,49 +484,39 @@
 static void
 totem_plugin_manager_init (TotemPluginManager *pm)
 {
-	GladeXML *xml;
+	GtkBuilder *xml;
 	GtkWidget *plugins_window;
 
 	pm->priv = TOTEM_PLUGIN_MANAGER_GET_PRIVATE (pm);
 
-	xml = totem_interface_load_with_root ("plugins.glade",
-					      "plugins_vbox",
-					      _("Plugins Manager"),
-					      TRUE,
-					      NULL);
+	xml = totem_interface_load ("plugins.ui", TRUE, NULL, pm);
 
-	gtk_container_add (GTK_CONTAINER (pm), glade_xml_get_widget (xml, "plugins_vbox"));
+	gtk_container_add (GTK_CONTAINER (pm), GTK_WIDGET (gtk_builder_get_object (xml, "plugins_vbox")));
 
 	gtk_box_set_spacing (GTK_BOX (pm), 6);
 
 	pm->priv->tree = gtk_tree_view_new ();
-	plugins_window = glade_xml_get_widget (xml, "plugins_list_window");
+	plugins_window = GTK_WIDGET (gtk_builder_get_object (xml, "plugins_list_window"));
 	gtk_container_add (GTK_CONTAINER (plugins_window), pm->priv->tree);
 
-	pm->priv->configure_button = glade_xml_get_widget (xml, "configure_button");
-	g_signal_connect (pm->priv->configure_button,
-			  "clicked",
-			  G_CALLBACK (configure_button_cb),
-			  pm);
-	
-	pm->priv->header_hbox = glade_xml_get_widget (xml, "header_hbox");
+	pm->priv->configure_button = GTK_WIDGET (gtk_builder_get_object (xml, "configure_button"));
+	pm->priv->header_hbox = GTK_WIDGET (gtk_builder_get_object (xml, "header_hbox"));
+	pm->priv->plugin_title = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_title"));
 
-	pm->priv->plugin_title = glade_xml_get_widget (xml, "plugin_title");
-
-	pm->priv->site_label = glade_xml_get_widget (xml, "site_label");
+	pm->priv->site_label = GTK_WIDGET (gtk_builder_get_object (xml, "site_label"));
 	totem_interface_boldify_label (xml, "site_label");
-	pm->priv->copyright_label = glade_xml_get_widget (xml, "copyright_label");
+	pm->priv->copyright_label = GTK_WIDGET (gtk_builder_get_object (xml, "copyright_label"));
 	totem_interface_boldify_label (xml, "copyright_label");
-	pm->priv->authors_label = glade_xml_get_widget (xml, "authors_label");
+	pm->priv->authors_label = GTK_WIDGET (gtk_builder_get_object (xml, "authors_label"));
 	totem_interface_boldify_label (xml, "authors_label");
-	pm->priv->description_label = glade_xml_get_widget (xml, "description_label");
+	pm->priv->description_label = GTK_WIDGET (gtk_builder_get_object (xml, "description_label"));
 	totem_interface_boldify_label (xml, "description_label");
 
-	pm->priv->plugin_icon = glade_xml_get_widget (xml, "plugin_icon");
-	pm->priv->site_text = glade_xml_get_widget (xml, "site_text");
-	pm->priv->copyright_text = glade_xml_get_widget (xml, "copyright_text");
-	pm->priv->authors_text = glade_xml_get_widget (xml, "authors_text");
-	pm->priv->description_text = glade_xml_get_widget (xml, "description_text");
+	pm->priv->plugin_icon = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_icon"));
+	pm->priv->site_text = GTK_WIDGET (gtk_builder_get_object (xml, "site_text"));
+	pm->priv->copyright_text = GTK_WIDGET (gtk_builder_get_object (xml, "copyright_text"));
+	pm->priv->authors_text = GTK_WIDGET (gtk_builder_get_object (xml, "authors_text"));
+	pm->priv->description_text = GTK_WIDGET (gtk_builder_get_object (xml, "description_text"));
 
 	plugin_manager_construct_tree (pm);
 
@@ -547,5 +540,5 @@
 
 	g_list_free (pm->priv->plugins);
 
-	G_OBJECT_CLASS(totem_plugin_manager_parent_class)->finalize (o);
+	G_OBJECT_CLASS (totem_plugin_manager_parent_class)->finalize (o);
 }
Index: src/totem-time-label.c
===================================================================
--- src/totem-time-label.c	(revision 4426)
+++ src/totem-time-label.c	(working copy)
@@ -43,18 +43,6 @@
 	return GTK_WIDGET (label);
 }
 
-GtkWidget *totem_time_label_new_from_glade (gchar *widget_name,
-		gchar *string1, gchar *string2,
-		gint int1, gint int2)
-{
-	GtkWidget *widget;
-
-	widget = totem_time_label_new ();
-	gtk_widget_show (widget);
-
-	return widget;
-}
-
 static void
 totem_time_label_class_init (TotemTimeLabelClass *klass)
 {
Index: src/totem-interface.c
===================================================================
--- src/totem-interface.c	(revision 4426)
+++ src/totem-interface.c	(working copy)
@@ -96,43 +96,41 @@
 	gtk_widget_destroy (error_dialog);
 }
 
-GladeXML *
-totem_interface_load_with_root (const char *name, const char *root_widget,
-		const char *display_name, gboolean fatal, GtkWindow *parent)
+GtkBuilder *
+totem_interface_load (const char *name, gboolean fatal, GtkWindow *parent, gpointer user_data)
 {
-	GladeXML *glade;
+	GtkBuilder *builder = NULL;
 	char *filename;
+	GError *error = NULL;
 
-	glade = NULL;
 	filename = totem_interface_get_full_path (name);
 
-	if (filename != NULL)
-		glade = glade_xml_new (filename, root_widget, GETTEXT_PACKAGE);
-	g_free (filename);
+	if (filename != NULL) {
+		builder = gtk_builder_new ();
+		gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
+	}
 
-	if (glade == NULL)
+	if (builder == NULL || gtk_builder_add_from_file (builder, filename, &error) == FALSE)
 	{
 		char *msg;
 
-		msg = g_strdup_printf (_("Couldn't load the '%s' interface."), display_name);
+		msg = g_strdup_printf (_("Couldn't load the '%s' interface. %s"), name, error->message);
 		if (fatal == FALSE)
 			totem_interface_error (msg, _("Make sure that Totem is properly installed."), parent);
 		else
 			totem_interface_error_blocking (msg, _("Make sure that Totem is properly installed."), parent);
 
 		g_free (msg);
+		g_free (filename);
+		g_error_free (error);
+
 		return NULL;
 	}
+	g_free (filename);
 
-	return glade;
-}
+	gtk_builder_connect_signals (builder, user_data);
 
-GladeXML *
-totem_interface_load (const char *name, const char *display_name,
-		gboolean fatal, GtkWindow *parent)
-{
-	return totem_interface_load_with_root (name, NULL, display_name,
-			fatal, parent);
+	return builder;
 }
 
 GdkPixbuf*
@@ -155,7 +153,7 @@
 	char *filename;
 
 #ifdef TOTEM_RUN_IN_SOURCE_TREE
-	/* Try the glade file in the source tree first */
+	/* Try the GtkBuilder file in the source tree first */
 	filename = g_build_filename ("..", "data", name, NULL);
 	if (g_file_test (filename, G_FILE_TEST_EXISTS) == FALSE)
 	{
@@ -256,11 +254,11 @@
 }
 
 void
-totem_interface_boldify_label (GladeXML *xml, const char *name)
+totem_interface_boldify_label (GtkBuilder *builder, const char *name)
 {
-	GtkWidget *widget;
+	GtkLabel *widget;
 
-	widget = glade_xml_get_widget (xml, name);
+	widget = GTK_LABEL (gtk_builder_get_object (builder, name));
 
 	if (widget == NULL) {
 		g_warning ("widget '%s' not found", name);
@@ -281,20 +279,20 @@
 		attr->end_index = G_MAXINT;
 		pango_attr_list_insert (pattrlist, attr);
 	}
-	gtk_label_set_attributes (GTK_LABEL (widget), pattrlist);*/
+	gtk_label_set_attributes (widget, pattrlist);*/
 
 	gchar *str_final;
-	str_final = g_strdup_printf ("<b>%s</b>", gtk_label_get_label (GTK_LABEL (widget)));
-	gtk_label_set_markup_with_mnemonic (GTK_LABEL (widget), str_final);
+	str_final = g_strdup_printf ("<b>%s</b>", gtk_label_get_label (widget));
+	gtk_label_set_markup_with_mnemonic (widget, str_final);
 	g_free (str_final);
 }
 
 void
-totem_interface_italicise_label (GladeXML *xml, const char *name)
+totem_interface_italicise_label (GtkBuilder *builder, const char *name)
 {
-	GtkWidget *widget;
+	GtkLabel *widget;
 
-	widget = glade_xml_get_widget (xml, name);
+	widget = GTK_LABEL (gtk_builder_get_object (builder, name));
 
 	if (widget == NULL) {
 		g_warning ("widget '%s' not found", name);
@@ -315,11 +313,11 @@
 		attr->end_index = G_MAXINT;
 		pango_attr_list_insert (pattrlist, attr);
 	}
-	gtk_label_set_attributes (GTK_LABEL (widget), pattrlist);*/
+	gtk_label_set_attributes (widget, pattrlist);*/
 
 	gchar *str_final;
-	str_final = g_strdup_printf ("<i>%s</i>", gtk_label_get_label (GTK_LABEL (widget)));
-	gtk_label_set_markup_with_mnemonic (GTK_LABEL (widget), str_final);
+	str_final = g_strdup_printf ("<i>%s</i>", gtk_label_get_label (widget));
+	gtk_label_set_markup_with_mnemonic (widget, str_final);
 	g_free (str_final);
 }
 
Index: src/totem-playlist.c
===================================================================
--- src/totem-playlist.c	(revision 4426)
+++ src/totem-playlist.c	(working copy)
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <glade/glade.h>
 #include <gconf/gconf-client.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
@@ -43,6 +42,13 @@
 static void ensure_shuffled (TotemPlaylist *playlist, gboolean shuffle);
 static gboolean totem_playlist_add_one_mrl (TotemPlaylist *playlist, const char *mrl, const char *display_name);
 
+/* Callback function for GtkBuilder */
+void totem_playlist_save_files (GtkWidget *widget, TotemPlaylist *playlist);
+void totem_playlist_add_files (GtkWidget *widget, TotemPlaylist *playlist);
+void playlist_remove_button_clicked (GtkWidget *button, TotemPlaylist *playlist);
+void totem_playlist_up_files (GtkWidget *widget, TotemPlaylist *playlist);
+void totem_playlist_down_files (GtkWidget *widget, TotemPlaylist *playlist);
+
 typedef gboolean (*PlaylistCallback) (TotemPlaylist *playlist, const char *mrl,
 		gpointer data);
 
@@ -59,7 +65,7 @@
 
 struct TotemPlaylistPrivate
 {
-	GladeXML *xml;
+	GtkBuilder *xml;
 
 	GtkWidget *treeview;
 	GtkTreeModel *model;
@@ -268,7 +274,7 @@
 	GtkWidget *button;
 	gboolean state;
 
-	button = glade_xml_get_widget (playlist->_priv->xml, "save_button");
+	button = GTK_WIDGET (gtk_builder_get_object (playlist->_priv->xml, "save_button"));
 	state = (!playlist->_priv->disable_save_to_disk) && (PL_LEN != 0);
 	gtk_widget_set_sensitive (button, state);
 }
@@ -623,11 +629,11 @@
 	GtkWidget *remove_button, *up_button, *down_button;
 	gboolean sensitivity;
 
-	remove_button = glade_xml_get_widget (playlist->_priv->xml,
-			"remove_button");
-	up_button = glade_xml_get_widget (playlist->_priv->xml, "up_button");
-	down_button = glade_xml_get_widget (playlist->_priv->xml,
-			"down_button");
+	remove_button = GTK_WIDGET (gtk_builder_get_object (playlist->_priv->xml,
+			"remove_button"));
+	up_button = GTK_WIDGET (gtk_builder_get_object (playlist->_priv->xml, "up_button"));
+	down_button = GTK_WIDGET (gtk_builder_get_object (playlist->_priv->xml,
+			"down_button"));
 
 	if (gtk_tree_selection_has_selected (treeselection))
 		sensitivity = TRUE;
@@ -669,7 +675,7 @@
 	return TRUE;
 }
 
-static void
+void
 totem_playlist_add_files (GtkWidget *widget, TotemPlaylist *playlist)
 {
 	GSList *filenames, *l;
@@ -812,7 +818,7 @@
 	gtk_tree_view_columns_autosize (GTK_TREE_VIEW (playlist->_priv->treeview));
 }
 
-static void
+void
 playlist_remove_button_clicked (GtkWidget *button, TotemPlaylist *playlist)
 {
 	playlist_remove_files (playlist);
@@ -882,7 +888,7 @@
 	return combo_box;
 }
 
-static void
+void
 totem_playlist_save_files (GtkWidget *widget, TotemPlaylist *playlist)
 {
 	GtkWidget *fs, *combo_box;
@@ -1055,13 +1061,13 @@
 			NULL);
 }
 
-static void
+void
 totem_playlist_up_files (GtkWidget *widget, TotemPlaylist *playlist)
 {
 	totem_playlist_move_files (playlist, TRUE);
 }
 
-static void
+void
 totem_playlist_down_files (GtkWidget *widget, TotemPlaylist *playlist)
 {
 	totem_playlist_move_files (playlist, FALSE);
@@ -1438,7 +1444,7 @@
 static void
 totem_playlist_init (TotemPlaylist *playlist)
 {
-	GtkWidget *container, *item;
+	GtkWidget *container;
 	char *filename;
 
 	playlist->_priv = g_new0 (TotemPlaylistPrivate, 1);
@@ -1455,8 +1461,7 @@
 			G_CALLBACK (totem_playlist_entry_parsed),
 			playlist);
 
-	playlist->_priv->xml = totem_interface_load_with_root ("playlist.glade",
-			"vbox4", _("playlist"), TRUE, NULL);
+	playlist->_priv->xml = totem_interface_load ("playlist.ui", TRUE, NULL, playlist);
 
 	if (playlist->_priv->xml == NULL)
 		return;
@@ -1480,34 +1485,12 @@
 	}
 	g_free (filename);
 
-	/* Connect the buttons */
-	item = glade_xml_get_widget (playlist->_priv->xml, "add_button");
-	g_signal_connect (G_OBJECT (item), "clicked",
-			G_CALLBACK (totem_playlist_add_files),
-			playlist);
-	item = glade_xml_get_widget (playlist->_priv->xml, "remove_button");
-	g_signal_connect (G_OBJECT (item), "clicked",
-			G_CALLBACK (playlist_remove_button_clicked),
-			playlist);
-	item = glade_xml_get_widget (playlist->_priv->xml, "save_button");
-	g_signal_connect (G_OBJECT (item), "clicked",
-			G_CALLBACK (totem_playlist_save_files),
-			playlist);
-	item = glade_xml_get_widget (playlist->_priv->xml, "up_button");
-	g_signal_connect (G_OBJECT (item), "clicked",
-			G_CALLBACK (totem_playlist_up_files),
-			playlist);
-	item = glade_xml_get_widget (playlist->_priv->xml, "down_button");
-	g_signal_connect (G_OBJECT (item), "clicked",
-			G_CALLBACK (totem_playlist_down_files),
-			playlist);
-
 	gtk_widget_add_events (GTK_WIDGET (playlist), GDK_KEY_PRESS_MASK);
 	g_signal_connect (G_OBJECT (playlist), "key_press_event",
 			G_CALLBACK (totem_playlist_key_press), playlist);
 
 	/* Reparent the vbox */
-	container = glade_xml_get_widget (playlist->_priv->xml, "vbox4");
+	container = GTK_WIDGET (gtk_builder_get_object (playlist->_priv->xml, "vbox4"));
 	g_object_ref (container);
 	gtk_box_pack_start (GTK_BOX (playlist),
 			container,
@@ -1516,8 +1499,8 @@
 			0);         /* padding */
 	g_object_unref (container);
 
-	playlist->_priv->treeview = glade_xml_get_widget
-		(playlist->_priv->xml, "treeview1");
+	playlist->_priv->treeview = GTK_WIDGET (gtk_builder_get_object
+		(playlist->_priv->xml, "treeview1"));
 	init_treeview (playlist->_priv->treeview, playlist);
 	playlist->_priv->model = gtk_tree_view_get_model
 		(GTK_TREE_VIEW (playlist->_priv->treeview));
Index: src/totem-preferences.c
===================================================================
--- src/totem-preferences.c	(revision 4426)
+++ src/totem-preferences.c	(working copy)
@@ -44,6 +44,24 @@
 
 #include "debug.h"
 
+/* Callback functions for GtkBuilder */
+void checkbutton1_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
+void checkbutton2_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
+void tvout_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
+void connection_combobox_changed (GtkComboBox *combobox, Totem *totem);
+void visual_menu_changed (GtkComboBox *combobox, Totem *totem);
+void visual_quality_menu_changed (GtkComboBox *combobox, Totem *totem);
+void brightness_changed (GtkRange *range, Totem *totem);
+void contrast_changed (GtkRange *range, Totem *totem);
+void saturation_changed (GtkRange *range, Totem *totem);
+void hue_changed (GtkRange *range, Totem *totem);
+void tpw_color_reset_clicked_cb (GtkButton *button, Totem *totem);
+void audio_out_menu_changed (GtkComboBox *combobox, Totem *totem);
+void font_set_cb (GtkFontButton * fb, Totem * totem);
+void encoding_set_cb (GtkComboBox *cb, Totem *totem);
+void font_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, Totem *totem);
+void encoding_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, Totem *totem);
+
 static void
 totem_action_info (char *reason, Totem *totem)
 {
@@ -97,8 +115,8 @@
 	return (answer == GTK_RESPONSE_YES ? TRUE : FALSE);
 }
 
-static void
-on_checkbutton1_toggled (GtkToggleButton *togglebutton, Totem *totem)
+void
+checkbutton1_toggled_cb (GtkToggleButton *togglebutton, Totem *totem)
 {
 	gboolean value;
 
@@ -117,15 +135,15 @@
 	gconf_client_set_bool (totem->gc,
 			GCONF_PREFIX"/show_vfx", value, NULL);
 
-	item = glade_xml_get_widget (totem->xml, "tpw_visuals_type_label");
+	item = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tpw_visuals_type_label"));
 	gtk_widget_set_sensitive (item, value);
-	item = glade_xml_get_widget (totem->xml,
-			"tpw_visuals_type_combobox");
+	item = GTK_WIDGET (gtk_builder_get_object (totem->xml,
+			"tpw_visuals_type_combobox"));
 	gtk_widget_set_sensitive (item, value);
-	item = glade_xml_get_widget (totem->xml, "tpw_visuals_size_label");
+	item = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tpw_visuals_size_label"));
 	gtk_widget_set_sensitive (item, value);
-	item = glade_xml_get_widget (totem->xml,
-			"tpw_visuals_size_combobox");
+	item = GTK_WIDGET (gtk_builder_get_object (totem->xml,
+			"tpw_visuals_size_combobox"));
 	gtk_widget_set_sensitive (item, value);
 
 	if (warn == FALSE)
@@ -145,8 +163,8 @@
 	}
 }
 
-static void
-on_checkbutton2_toggled (GtkToggleButton *togglebutton, Totem *totem)
+void
+checkbutton2_toggled_cb (GtkToggleButton *togglebutton, Totem *totem)
 {
 	gboolean value;
 
@@ -166,8 +184,8 @@
 	totem_prefs_set_show_visuals (totem, value, TRUE);
 }
 
-static void
-on_tvout_toggled (GtkToggleButton *togglebutton, Totem *totem)
+void
+tvout_toggled_cb (GtkToggleButton *togglebutton, Totem *totem)
 {
 	TvOutType type;
 	gboolean value;
@@ -206,36 +224,36 @@
 auto_resize_changed_cb (GConfClient *client, guint cnxn_id,
 		GConfEntry *entry, Totem *totem)
 {
-	GtkWidget *item;
+	GObject *item;
 
-	item = glade_xml_get_widget (totem->xml, "tpw_display_checkbutton");
-	g_signal_handlers_disconnect_by_func (G_OBJECT (item),
-			on_checkbutton1_toggled, totem);
+	item = gtk_builder_get_object (totem->xml, "tpw_display_checkbutton");
+	g_signal_handlers_disconnect_by_func (item,
+			checkbutton1_toggled_cb, totem);
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item),
 			gconf_client_get_bool (totem->gc,
 				GCONF_PREFIX"/auto_resize", NULL));
 
-	g_signal_connect (G_OBJECT (item), "toggled",
-			G_CALLBACK (on_checkbutton1_toggled), totem);
+	g_signal_connect (item, "toggled",
+			G_CALLBACK (checkbutton1_toggled_cb), totem);
 }
 
 static void
 show_vfx_changed_cb (GConfClient *client, guint cnxn_id,
 		GConfEntry *entry, Totem *totem)
 {
-	GtkWidget *item;
+	GObject *item;
 
-	item = glade_xml_get_widget (totem->xml, "tpw_visuals_checkbutton");
-	g_signal_handlers_disconnect_by_func (G_OBJECT (item),
-			on_checkbutton2_toggled, totem);
+	item = gtk_builder_get_object (totem->xml, "tpw_visuals_checkbutton");
+	g_signal_handlers_disconnect_by_func (item,
+			checkbutton2_toggled_cb, totem);
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item),
 			gconf_client_get_bool (totem->gc,
 				GCONF_PREFIX"/show_vfx", NULL));
 
-	g_signal_connect (G_OBJECT (item), "toggled",
-			G_CALLBACK (on_checkbutton2_toggled), totem);
+	g_signal_connect (item, "toggled",
+			G_CALLBACK (checkbutton2_toggled_cb), totem);
 }
 
 static void
@@ -247,12 +265,12 @@
 
 	locked = gconf_client_get_bool (totem->gc,
 			"/desktop/gnome/lockdown/disable_save_to_disk", NULL);
-	item = glade_xml_get_widget (totem->xml,
-			"tmw_take_screenshot_menu_item");
+	item = GTK_WIDGET (gtk_builder_get_object (totem->xml,
+			"tmw_take_screenshot_menu_item"));
 	gtk_widget_set_sensitive (item, !locked);
 }
 
-static void
+void
 connection_combobox_changed (GtkComboBox *combobox, Totem *totem)
 {
 	int i;
@@ -262,7 +280,7 @@
 		(BACON_VIDEO_WIDGET (totem->bvw), i);
 }
 
-static void
+void
 visual_menu_changed (GtkComboBox *combobox, Totem *totem)
 {
 	GList *list;
@@ -288,7 +306,7 @@
 	g_free (old_name);
 }
 
-static void
+void
 visual_quality_menu_changed (GtkComboBox *combobox, Totem *totem)
 {
 	int i;
@@ -299,7 +317,7 @@
 	bacon_video_widget_set_visuals_quality (totem->bvw, i);
 }
 
-static void
+void
 brightness_changed (GtkRange *range, Totem *totem)
 {
 	gdouble i;
@@ -309,7 +327,7 @@
 			BVW_VIDEO_BRIGHTNESS, (int) i);
 }
 
-static void
+void
 contrast_changed (GtkRange *range, Totem *totem)
 {
 	gdouble i;
@@ -319,7 +337,7 @@
 			BVW_VIDEO_CONTRAST, (int) i);
 }
 
-static void
+void
 saturation_changed (GtkRange *range, Totem *totem)
 {
 	gdouble i;
@@ -329,7 +347,7 @@
 			BVW_VIDEO_SATURATION, (int) i);
 }
 
-static void
+void
 hue_changed (GtkRange *range, Totem *totem)
 {
 	gdouble i;
@@ -339,8 +357,8 @@
 			BVW_VIDEO_HUE, (int) i);
 }
 
-static void
-on_tpw_color_reset_clicked (GtkButton *button, Totem *totem)
+void
+tpw_color_reset_clicked_cb (GtkButton *button, Totem *totem)
 {
 	guint i;
 	char *scales[] = {
@@ -351,13 +369,13 @@
 	};
 
 	for (i = 0; i < G_N_ELEMENTS (scales); i++) {
-		GtkWidget *item;
-		item = glade_xml_get_widget (totem->xml, scales[i]);
-		gtk_range_set_value (GTK_RANGE (item), 65535/2);
+		GtkRange *item;
+		item = GTK_RANGE (gtk_builder_get_object (totem->xml, scales[i]));
+		gtk_range_set_value (item, 65535/2);
 	}
 }
 
-static void
+void
 audio_out_menu_changed (GtkComboBox *combobox, Totem *totem)
 {
 	BaconVideoWidgetAudioOutType audio_out;
@@ -373,8 +391,8 @@
 	}
 }
 
-static void
-on_font_set (GtkFontButton * fb, Totem * totem)
+void
+font_set_cb (GtkFontButton * fb, Totem * totem)
 {
 	const gchar *font;
 
@@ -383,8 +401,8 @@
 				 font, NULL);
 }
 
-static void
-on_encoding_set (GtkComboBox *cb, Totem *totem)
+void
+encoding_set_cb (GtkComboBox *cb, Totem *totem)
 {
 	const gchar *encoding;
 
@@ -395,36 +413,36 @@
 				encoding, NULL);
 }
 
-static void
+void
 font_changed_cb (GConfClient *client, guint cnxn_id,
 		 GConfEntry *entry, Totem *totem)
 {
 	const gchar *font;
-	GtkWidget *item;
+	GtkFontButton *item;
 
-	item = glade_xml_get_widget (totem->xml, "font_sel_button");
+	item = GTK_FONT_BUTTON (gtk_builder_get_object (totem->xml, "font_sel_button"));
 	font = gconf_value_get_string (entry->value);
-	gtk_font_button_set_font_name (GTK_FONT_BUTTON (item), font);
+	gtk_font_button_set_font_name (item, font);
 	bacon_video_widget_set_subtitle_font (totem->bvw, font);
 }
 
-static void
+void
 encoding_changed_cb (GConfClient *client, guint cnxn_id,
 		 GConfEntry *entry, Totem *totem)
 {
 	const gchar *encoding;
-	GtkWidget *item;
+	GtkComboBox *item;
 
-	item = glade_xml_get_widget (totem->xml, "subtitle_encoding_combo");
+	item = GTK_COMBO_BOX (gtk_builder_get_object (totem->xml, "subtitle_encoding_combo"));
 	encoding = gconf_value_get_string (entry->value);
-	totem_subtitle_encoding_set (GTK_COMBO_BOX(item), encoding);
+	totem_subtitle_encoding_set (item, encoding);
 	bacon_video_widget_set_subtitle_encoding (totem->bvw, encoding);
 }
 
 void
 totem_setup_preferences (Totem *totem)
 {
-	GtkWidget *item, *menu;
+	GtkWidget *menu;
 	GtkAction *action;
 	gboolean show_visuals, auto_resize, is_local, deinterlace;
 	int connection_speed, i;
@@ -432,6 +450,7 @@
 	GList *list, *l;
 	BaconVideoWidgetAudioOutType audio_out;
 	GConfValue *value;
+	GObject *item;
 
 	g_return_if_fail (totem->gc != NULL);
 
@@ -453,9 +472,9 @@
 			disable_save_to_disk_changed_cb,
 			totem, NULL, NULL);
 
-	/* Work-around glade dialogue not parenting properly for
+	/* Work-around builder dialogue not parenting properly for
 	 * On top windows */
-	item = glade_xml_get_widget (totem->xml, "tpw_notebook");
+	item = gtk_builder_get_object (totem->xml, "tpw_notebook");
 	totem->prefs = gtk_dialog_new_with_buttons (_("Preferences"),
 			GTK_WINDOW (totem->win),
 			GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -464,11 +483,11 @@
 			NULL);
 	gtk_dialog_set_has_separator (GTK_DIALOG (totem->prefs), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (totem->prefs), 5);
-	gtk_box_set_spacing (GTK_BOX(GTK_DIALOG(totem->prefs)->vbox), 2);
-	gtk_widget_reparent (item, GTK_DIALOG (totem->prefs)->vbox);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (totem->prefs)->vbox), 2);
+	gtk_widget_reparent (GTK_WIDGET (item), GTK_DIALOG (totem->prefs)->vbox);
 	gtk_widget_show_all (GTK_DIALOG (totem->prefs)->vbox);
-	item = glade_xml_get_widget (totem->xml, "totem_preferences_window");
-	gtk_widget_destroy (item);
+	item = gtk_builder_get_object (totem->xml, "totem_preferences_window");
+	gtk_widget_destroy (GTK_WIDGET (item));
 
 	/* Boldify some labels */
 	totem_interface_boldify_label (totem->xml, "tpw_network_label");
@@ -487,22 +506,18 @@
 	/* Auto-resize */
 	auto_resize = gconf_client_get_bool (totem->gc,
 			GCONF_PREFIX"/auto_resize", NULL);
-	item = glade_xml_get_widget (totem->xml, "tpw_display_checkbutton");
+	item = gtk_builder_get_object (totem->xml, "tpw_display_checkbutton");
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item), auto_resize);
-	g_signal_connect (G_OBJECT (item), "toggled",
-			G_CALLBACK (on_checkbutton1_toggled), totem);
 	bacon_video_widget_set_auto_resize
 		(BACON_VIDEO_WIDGET (totem->bvw), auto_resize);
 
 	/* Connection Speed */
 	connection_speed = bacon_video_widget_get_connection_speed (totem->bvw);
-	item = glade_xml_get_widget (totem->xml, "tpw_speed_combobox");
+	item = gtk_builder_get_object (totem->xml, "tpw_speed_combobox");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (item), connection_speed);
-	g_signal_connect (item, "changed",
-			G_CALLBACK (connection_combobox_changed), totem);
 
 	/* Enable visuals */
-	item = glade_xml_get_widget (totem->xml, "tpw_visuals_checkbutton");
+	item = gtk_builder_get_object (totem->xml, "tpw_visuals_checkbutton");
 	show_visuals = gconf_client_get_bool (totem->gc,
 			GCONF_PREFIX"/show_vfx", NULL);
 	if (is_local == FALSE && show_visuals != FALSE)
@@ -511,8 +526,6 @@
 	gtk_toggle_button_set_active
 		(GTK_TOGGLE_BUTTON (item), show_visuals);
 	totem_prefs_set_show_visuals (totem, show_visuals, FALSE);
-	g_signal_connect (G_OBJECT (item), "toggled",
-			G_CALLBACK (on_checkbutton2_toggled), totem);
 
 	/* Visuals list */
 	list = bacon_video_widget_get_visuals_list (totem->bvw);
@@ -526,9 +539,7 @@
 		visual = g_strdup ("goom");
 	}
 
-	item = glade_xml_get_widget (totem->xml, "tpw_visuals_type_combobox");
-	g_signal_connect (G_OBJECT (item), "changed",
-			G_CALLBACK (visual_menu_changed), totem);
+	item = gtk_builder_get_object (totem->xml, "tpw_visuals_type_combobox");
 
 	i = 0;
 	for (l = list; l != NULL; l = l->next)
@@ -548,54 +559,37 @@
 	i = gconf_client_get_int (totem->gc,
 			GCONF_PREFIX"/visual_quality", NULL);
 	bacon_video_widget_set_visuals_quality (totem->bvw, i);
-	item = glade_xml_get_widget (totem->xml, "tpw_visuals_size_combobox");
+	item = gtk_builder_get_object (totem->xml, "tpw_visuals_size_combobox");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (item), i);
-	g_signal_connect (G_OBJECT (item), "changed",
-			G_CALLBACK (visual_quality_menu_changed), totem);
 
 	/* Brightness */
-	item = glade_xml_get_widget (totem->xml, "tpw_bright_scale");
+	item = gtk_builder_get_object (totem->xml, "tpw_bright_scale");
 	i = bacon_video_widget_get_video_property (totem->bvw,
 			BVW_VIDEO_BRIGHTNESS);
 	gtk_range_set_value (GTK_RANGE (item), (gdouble) i);
-	g_signal_connect (G_OBJECT (item), "value-changed",
-			G_CALLBACK (brightness_changed), totem);
 
 	/* Contrast */
-	item = glade_xml_get_widget (totem->xml, "tpw_contrast_scale");
+	item = gtk_builder_get_object (totem->xml, "tpw_contrast_scale");
 	i = bacon_video_widget_get_video_property (totem->bvw,
 			BVW_VIDEO_CONTRAST);
 	gtk_range_set_value (GTK_RANGE (item), (gdouble) i);
-	g_signal_connect (G_OBJECT (item), "value-changed",
-			G_CALLBACK (contrast_changed), totem);
 
 	/* Saturation */
-	item = glade_xml_get_widget (totem->xml, "tpw_saturation_scale");
+	item = gtk_builder_get_object (totem->xml, "tpw_saturation_scale");
 	i = bacon_video_widget_get_video_property (totem->bvw,
 			BVW_VIDEO_SATURATION);
 	gtk_range_set_value (GTK_RANGE (item), (gdouble) i);
-	g_signal_connect (G_OBJECT (item), "value-changed",
-			G_CALLBACK (saturation_changed), totem);
 
 	/* Hue */
-	item = glade_xml_get_widget (totem->xml, "tpw_hue_scale");
+	item = gtk_builder_get_object (totem->xml, "tpw_hue_scale");
 	i = bacon_video_widget_get_video_property (totem->bvw,
 			BVW_VIDEO_HUE);
 	gtk_range_set_value (GTK_RANGE (item), (gdouble) i);
-	g_signal_connect (G_OBJECT (item), "value-changed",
-			G_CALLBACK (hue_changed), totem);
 
-	/* Reset colour balance */
-	item = glade_xml_get_widget (totem->xml, "tpw_color_reset");
-	g_signal_connect (G_OBJECT (item), "clicked",
-			G_CALLBACK (on_tpw_color_reset_clicked), totem);
-
 	/* Sound output type */
-	item = glade_xml_get_widget (totem->xml, "tpw_sound_output_combobox");
+	item = gtk_builder_get_object (totem->xml, "tpw_sound_output_combobox");
 	audio_out = bacon_video_widget_get_audio_out_type (totem->bvw);
 	gtk_combo_box_set_active (GTK_COMBO_BOX (item), audio_out);
-	g_signal_connect (G_OBJECT (item), "changed",
-			G_CALLBACK (audio_out_menu_changed), totem);
 
 	/* This one is for the deinterlacing menu, not really our dialog
 	 * but we do it anyway */
@@ -619,8 +613,7 @@
 				NULL));
 
 	/* Subtitle font selection */
-	item = glade_xml_get_widget (totem->xml, "font_sel_button");
-	g_signal_connect (item, "font-set", G_CALLBACK (on_font_set), totem);
+	item = gtk_builder_get_object (totem->xml, "font_sel_button");
 	gtk_font_button_set_title (GTK_FONT_BUTTON (item),
 				   _("Select Subtitle Font"));
 	font = gconf_client_get_string (totem->gc,
@@ -635,9 +628,8 @@
 			totem, NULL, NULL);
 
 	/* Subtitle encoding selection */
-	item = glade_xml_get_widget (totem->xml, "subtitle_encoding_combo");
+	item = gtk_builder_get_object (totem->xml, "subtitle_encoding_combo");
 	totem_subtitle_encoding_init (GTK_COMBO_BOX (item));
-	g_signal_connect (item, "changed", G_CALLBACK (on_encoding_set), totem);
 	value = gconf_client_get_without_default (totem->gc,
 			GCONF_PREFIX"/subtitle_encoding", NULL);
 	/* Make sure the default is UTF-8 */
@@ -669,7 +661,7 @@
 void
 totem_preferences_tvout_setup (Totem *totem)
 {
-	GtkWidget *item;
+	GObject *item;
 	TvOutType type;
 	const char *name;
 
@@ -690,31 +682,25 @@
 		name = NULL;
 	}
 
-	item = glade_xml_get_widget (totem->xml, name);
+	item = gtk_builder_get_object (totem->xml, name);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item), TRUE);
 
-	item = glade_xml_get_widget (totem->xml, "tpw_notvout_radio_button");
-	g_signal_connect (G_OBJECT (item), "toggled",
-			G_CALLBACK (on_tvout_toggled), totem);
-	g_object_set_data (G_OBJECT (item), "tvout_type",
+	item = gtk_builder_get_object (totem->xml, "tpw_notvout_radio_button");
+	g_object_set_data (item, "tvout_type",
 			GINT_TO_POINTER (TV_OUT_NONE));
-	gtk_widget_set_sensitive(item, 
+	gtk_widget_set_sensitive (GTK_WIDGET (item), 
 			bacon_video_widget_fullscreen_mode_available (totem->bvw, TV_OUT_NONE));
 
-	item = glade_xml_get_widget (totem->xml, "tpw_nvtvpalmode_radio_button");
-        g_signal_connect (G_OBJECT (item), "toggled",
-                G_CALLBACK (on_tvout_toggled), totem);
-        g_object_set_data (G_OBJECT (item), "tvout_type",
+	item = gtk_builder_get_object (totem->xml, "tpw_nvtvpalmode_radio_button");
+        g_object_set_data (item, "tvout_type",
                 GINT_TO_POINTER (TV_OUT_NVTV_PAL));
-	gtk_widget_set_sensitive(item, 
+	gtk_widget_set_sensitive (GTK_WIDGET (item), 
 			bacon_video_widget_fullscreen_mode_available (totem->bvw, TV_OUT_NVTV_PAL));
 
-	item = glade_xml_get_widget (totem->xml, "tpw_nvtvntscmode_radio_button");
-	g_signal_connect (G_OBJECT (item), "toggled",
-			G_CALLBACK (on_tvout_toggled), totem);
-	g_object_set_data (G_OBJECT (item), "tvout_type",
+	item = gtk_builder_get_object (totem->xml, "tpw_nvtvntscmode_radio_button");
+	g_object_set_data (item, "tvout_type",
                 GINT_TO_POINTER (TV_OUT_NVTV_NTSC));
-	gtk_widget_set_sensitive(item, 
+	gtk_widget_set_sensitive (GTK_WIDGET (item), 
 			bacon_video_widget_fullscreen_mode_available (totem->bvw, TV_OUT_NVTV_NTSC));
 }
 
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 4426)
+++ src/Makefile.am	(working copy)
@@ -59,8 +59,8 @@
 	totem-fullscreen.h
 
 libtotem_player_la_CPPFLAGS = \
+	-I$(srcdir)/backend	\
 	-I$(srcdir)/plparse	\
-	-I$(srcdir)/backend	\
 	$(common_defines)	\
 	$(AM_CPPFLAGS)
 
Index: src/totem.c
===================================================================
--- src/totem.c	(revision 4426)
+++ src/totem.c	(working copy)
@@ -28,12 +28,11 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <math.h>
-
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <stdlib.h>
+#include <math.h>
 
 #ifndef HAVE_GTK_ONLY
 #include <gnome.h>
@@ -84,10 +83,10 @@
 #define ZOOM_DISABLE (ZOOM_LOWER - 1)
 #define ZOOM_ENABLE (ZOOM_UPPER + 1)
 
-#define BVW_VBOX_BORDER_WIDTH 1
-
 #define VOLUME_EPSILON (1e-10)
 
+#define BVW_VBOX_BORDER_WIDTH 1
+
 static const GtkTargetEntry target_table[] = {
 	{ "text/uri-list", 0, 0 },
 	{ "_NETSCAPE_URL", 0, 1 },
@@ -100,6 +99,18 @@
 static void playlist_changed_cb (GtkWidget *playlist, Totem *totem);
 static void play_pause_set_label (Totem *totem, TotemStates state);
 
+/* Callback functions for GtkBuilder */
+gboolean main_window_destroy_cb (GtkWidget *widget, GdkEvent *event, Totem *totem);
+gboolean window_state_event_cb (GtkWidget *window, GdkEventWindowState *event, Totem *totem);
+gboolean seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem);
+void seek_slider_changed_cb (GtkAdjustment *adj, Totem *totem);
+gboolean seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem);
+void volume_button_value_changed_cb (GtkScaleButton *button, gdouble value, Totem *totem);
+int window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, Totem *totem);
+int window_scroll_event_cb (GtkWidget *win, GdkEventScroll *event, Totem *totem);
+void main_pane_size_allocated (GtkWidget *main_pane, GtkAllocation *allocation, Totem *totem);
+void fs_exit1_activate_cb (GtkButton *button, Totem *totem);
+
 static void
 long_action (void)
 {
@@ -126,7 +137,7 @@
 static void
 totem_action_save_size (Totem *totem)
 {
-	GtkWidget *item;
+	GtkPaned *item;
 
 	if (totem->bvw == NULL)
 		return;
@@ -135,11 +146,11 @@
 		return;
 
 	/* Save the size of the video widget */
-	item = glade_xml_get_widget (totem->xml, "tmw_main_pane");
+	item = GTK_PANED (gtk_builder_get_object (totem->xml, "tmw_main_pane"));
 	gtk_window_get_size (GTK_WINDOW (totem->win), &totem->window_w,
 			&totem->window_h);
 	totem->sidebar_w = totem->window_w
-		- gtk_paned_get_position (GTK_PANED (item));
+		- gtk_paned_get_position (item);
 }
 
 static void
@@ -205,9 +216,9 @@
 		gdk_display_sync (display);
 
 	if (totem->bvw) {
-	        int vol;
+		int vol;
 
-	        vol = bacon_video_widget_get_volume (totem->bvw) * 100.0 + 0.5;
+		vol = bacon_video_widget_get_volume (totem->bvw) * 100.0 + 0.5;
 		//FIXME move the volume to the static file?
 		gconf_client_set_int (totem->gc,
 				GCONF_PREFIX"/volume",
@@ -250,7 +261,7 @@
 	gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
 }
 
-static gboolean
+gboolean
 main_window_destroy_cb (GtkWidget *widget, GdkEvent *event, Totem *totem)
 {
 	totem_action_exit (totem);
@@ -589,7 +600,7 @@
 	}
 }
 
-static gboolean
+gboolean
 window_state_event_cb (GtkWidget *window, GdkEventWindowState *event,
 		       Totem *totem)
 {
@@ -637,6 +648,12 @@
 }
 
 void
+fs_exit1_activate_cb (GtkButton *button, Totem *totem)
+{
+	totem_action_fullscreen_toggle (totem);
+}
+
+void
 totem_action_fullscreen_toggle (Totem *totem)
 {
 	if (totem_is_fullscreen (totem) != FALSE)
@@ -753,7 +770,7 @@
 	}
 
 	filename = g_build_filename (DATADIR,
-			"totem", "screenshot.glade", NULL);
+			"totem", "screenshot.ui", NULL);
 	dialog = totem_screenshot_new (pixbuf);
 	g_free (filename);
 
@@ -902,8 +919,8 @@
 		totem_main_set_sensitivity ("tmw_volume_button", caps);
 		totem_fullscreen_set_can_set_volume (totem->fs, caps);
 		volume = bacon_video_widget_get_volume (totem->bvw);
-	        totem_action_set_sensitivity ("volume-up", caps && volume < (1.0 - VOLUME_EPSILON));
-	        totem_action_set_sensitivity ("volume-down", caps && volume > VOLUME_EPSILON);
+		totem_action_set_sensitivity ("volume-up", caps && volume < (1.0 - VOLUME_EPSILON));
+		totem_action_set_sensitivity ("volume-down", caps && volume > VOLUME_EPSILON);
 		totem->volume_sensitive = caps;
 
 		/* Take a screenshot */
@@ -1487,7 +1504,7 @@
 				(int) (stream_length / 1000));
 		}
 
-		totem_time_label_set_time 
+		totem_time_label_set_time
 			(TOTEM_TIME_LABEL (totem->fs->time_label),
 			 current_time, stream_length);
 	}
@@ -1498,8 +1515,8 @@
 	}
 }
 
-static void
-volume_button_value_changed (GtkScaleButton *button, gdouble value, Totem *totem)
+void
+volume_button_value_changed_cb (GtkScaleButton *button, gdouble value, Totem *totem)
 {
 	bacon_video_widget_set_volume (totem->bvw, value);
 }
@@ -1512,10 +1529,10 @@
 
 	volume = bacon_video_widget_get_volume (totem->bvw);
 
-	g_signal_handlers_block_by_func (totem->volume, volume_button_value_changed, totem);
+	g_signal_handlers_block_by_func (totem->volume, volume_button_value_changed_cb, totem);
 	gtk_scale_button_set_value (GTK_SCALE_BUTTON (totem->volume), volume);
-	g_signal_handlers_unblock_by_func (totem->volume, volume_button_value_changed, totem);
-
+	g_signal_handlers_unblock_by_func (totem->volume, volume_button_value_changed_cb, totem);
+  
 	action = gtk_action_group_get_action (totem->main_action_group, "volume-down");
 	gtk_action_set_sensitive (action, volume > VOLUME_EPSILON && totem->volume_sensitive);
 
@@ -1543,18 +1560,17 @@
 	update_seekable (totem);
 }
 
-static gboolean
+gboolean
 seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem)
 {
 	totem->seek_lock = TRUE;
 	totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), TRUE);
-	totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label),
-				      TRUE);
+	totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label), TRUE);
 
 	return FALSE;
 }
 
-static void
+void
 seek_slider_changed_cb (GtkAdjustment *adj, Totem *totem)
 {
 	double pos;
@@ -1568,14 +1584,14 @@
 	totem_statusbar_set_time_and_length (TOTEM_STATUSBAR (totem->statusbar),
 			(int) (pos * time / 1000), time / 1000);
 	totem_time_label_set_time
-		(TOTEM_TIME_LABEL (totem->fs->time_label),
-		 (int) (pos * time), time);
+			(TOTEM_TIME_LABEL (totem->fs->time_label),
+			 (int) (pos * time), time);
 
 	if (bacon_video_widget_can_direct_seek (totem->bvw) != FALSE)
 		totem_action_seek (totem, pos);
 }
 
-static gboolean
+gboolean
 seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem)
 {
 	GtkAdjustment *adj;
@@ -1596,8 +1612,7 @@
 
 	totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), FALSE);
 	totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label),
-				      FALSE);
-
+			FALSE);
 	return FALSE;
 }
 
@@ -1702,12 +1717,6 @@
 	return changed;
 }
 
-static void
-on_fs_exit1_activate (GtkButton *button, Totem *totem)
-{
-	totem_action_fullscreen_toggle (totem);
-}
-
 void
 show_controls (Totem *totem, gboolean was_fullscreen)
 {
@@ -1718,10 +1727,10 @@
 	if (totem->bvw == NULL)
 		return;
 
-	menubar = glade_xml_get_widget (totem->xml, "tmw_menubar_box");
-	controlbar = glade_xml_get_widget (totem->xml, "tmw_controls_vbox");
-	statusbar = glade_xml_get_widget (totem->xml, "tmw_statusbar");
-	bvw_box = glade_xml_get_widget (totem->xml, "tmw_bvw_box");
+	menubar = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_menubar_box"));
+	controlbar = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_controls_vbox"));
+	statusbar = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_statusbar"));
+	bvw_box = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_bvw_box"));
 	widget = GTK_WIDGET (totem->bvw);
 
 	action = gtk_action_group_get_action (totem->main_action_group, "show-controls");
@@ -1747,8 +1756,8 @@
 			int handle_size;
 
 			g_value_init (&value, G_TYPE_INT);
-			pane = glade_xml_get_widget (totem->xml,
-					"tmw_main_pane");
+			pane = GTK_WIDGET (gtk_builder_get_object (totem->xml,
+					"tmw_main_pane"));
 			gtk_widget_style_get_property (pane, "handle-size",
 					&value);
 			handle_size = g_value_get_int (&value);
@@ -2457,8 +2466,8 @@
 	return retval;
 }
 
-static int
-on_window_key_press_event (GtkWidget *win, GdkEventKey *event, Totem *totem)
+int
+window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, Totem *totem)
 {
 	/* Special case Eject, Open, Open URI and
 	 * seeking keyboard shortcuts */
@@ -2520,8 +2529,8 @@
 	}
 }
 
-static int
-on_window_scroll_event (GtkWidget *win, GdkEventScroll *event, Totem *totem)
+int
+window_scroll_event_cb (GtkWidget *win, GdkEventScroll *event, Totem *totem)
 {
 	return totem_action_handle_scroll (totem, event->direction);
 }
@@ -2567,7 +2576,7 @@
 	totem_action_set_sensitivity ("next-chapter", has_item);
 }
 
-static void
+void
 main_pane_size_allocated (GtkWidget *main_pane, GtkAllocation *allocation, Totem *totem)
 {
 	gulong handler_id;
@@ -2591,7 +2600,7 @@
 	gboolean show_sidebar;
 	char *filename, *page_id;
 	GError *err = NULL;
-	GtkWidget *main_pane, *vbox;
+	GtkWidget *vbox;
 	GdkColor black;
 
 	filename = g_build_filename (totem_dot_dir (), "state.ini", NULL);
@@ -2660,11 +2669,8 @@
 		gtk_window_maximize (GTK_WINDOW (totem->win));
 	}
 
-	main_pane = glade_xml_get_widget (totem->xml, "tmw_main_pane");
-	g_signal_connect (G_OBJECT (main_pane), "size-allocate", G_CALLBACK (main_pane_size_allocated), totem);
-
 	/* Set the vbox to be completely black */
-	vbox = glade_xml_get_widget (totem->xml, "tmw_bvw_box");
+	vbox = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_bvw_box"));
 	gdk_color_parse ("Black", &black);
 	for (i = 0; i <= GTK_STATE_INSENSITIVE; i++)
 		gtk_widget_modify_bg (vbox, i, &black);
@@ -2676,9 +2682,10 @@
 static void
 totem_callback_connect (Totem *totem)
 {
-	GtkWidget *item, *box, *arrow;
+	GtkWidget *item, *arrow;
 	GtkAction *action;
 	GtkTooltips *tooltips;
+	GtkBox *box;
 
 	tooltips = gtk_tooltips_new ();
 
@@ -2694,7 +2701,7 @@
 		totem_playlist_get_shuffle (totem->playlist));
 
 	/* Controls */
-	box = glade_xml_get_widget (totem->xml, "tmw_buttons_hbox");
+	box = GTK_BOX (gtk_builder_get_object (totem->xml, "tmw_buttons_hbox"));
 
 	action = gtk_action_group_get_action (totem->main_action_group, "play");
 	item = gtk_action_create_tool_item (action);
@@ -2704,7 +2711,7 @@
  				   GTK_TOOLTIPS (tooltips),
  				   _("Play / Pause"), 
  				   NULL);
-	gtk_box_pack_start (GTK_BOX (box), item, FALSE, FALSE, 0);
+	gtk_box_pack_start (box, item, FALSE, FALSE, 0);
 
 	action = gtk_action_group_get_action (totem->main_action_group,
 			"previous-chapter");
@@ -2715,7 +2722,7 @@
 				   NULL);
 	atk_object_set_name (gtk_widget_get_accessible (item),
 			_("Previous Chapter/Movie"));
-	gtk_box_pack_start (GTK_BOX (box), item, FALSE, FALSE, 0);
+	gtk_box_pack_start (box, item, FALSE, FALSE, 0);
 
 	action = gtk_action_group_get_action (totem->main_action_group,
 			"next-chapter");
@@ -2726,32 +2733,26 @@
 				   NULL);
 	atk_object_set_name (gtk_widget_get_accessible (item),
 			_("Next Chapter/Movie"));
-	gtk_box_pack_start (GTK_BOX (box), item, FALSE, FALSE, 0);
+	gtk_box_pack_start (box, item, FALSE, FALSE, 0);
 
 	/* Sidebar button (Drag'n'Drop) */
-	box = glade_xml_get_widget (totem->xml, "tmw_sidebar_button_hbox");
+	box = GTK_BOX (gtk_builder_get_object (totem->xml, "tmw_sidebar_button_hbox"));
 	action = gtk_action_group_get_action (totem->main_action_group, "sidebar");
 	item = gtk_toggle_button_new ();
 	gtk_action_connect_proxy (action, item);
 	arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
 	gtk_widget_show (arrow);
 	gtk_button_set_image (GTK_BUTTON (item), arrow);
-	gtk_box_pack_start (GTK_BOX (box), item, FALSE, FALSE, 0);
+	gtk_box_pack_start (box, item, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (item), "drag_data_received",
 			G_CALLBACK (drop_playlist_cb), totem);
 	gtk_drag_dest_set (item, GTK_DEST_DEFAULT_ALL,
 			target_table, G_N_ELEMENTS (target_table),
 			GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-	/* Main Window */
-	g_signal_connect (G_OBJECT (totem->win), "delete-event",
-			G_CALLBACK (main_window_destroy_cb), totem);
-	g_signal_connect (G_OBJECT (totem->win), "window-state-event",
-			G_CALLBACK (window_state_event_cb), totem);
-
 	/* Fullscreen window buttons */
 	g_signal_connect (G_OBJECT (totem->fs->exit_button), "clicked",
-			  G_CALLBACK (on_fs_exit1_activate), totem);
+			  G_CALLBACK (fs_exit1_activate_cb), totem);
 
 	action = gtk_action_group_get_action (totem->main_action_group, "play");
 	item = gtk_action_create_tool_item (action);
@@ -2771,40 +2772,14 @@
 	g_signal_connect (G_OBJECT (item), "clicked",
 			G_CALLBACK (on_mouse_click_fullscreen), totem);
 
-	/* Fullscreen Control Popup Sliders */
-	g_signal_connect (G_OBJECT(totem->fs->seek), "button_press_event",
-			G_CALLBACK (seek_slider_pressed_cb), totem);
-	g_signal_connect (G_OBJECT(totem->fs->seek), "button_release_event",
-			G_CALLBACK (seek_slider_released_cb), totem);
-
 	/* Connect the keys */
 	gtk_widget_add_events (totem->win, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
-	g_signal_connect (G_OBJECT(totem->win), "key_press_event",
-			G_CALLBACK (on_window_key_press_event), totem);
-	g_signal_connect (G_OBJECT(totem->win), "key_release_event",
-			G_CALLBACK (on_window_key_press_event), totem);
 
 	/* Connect the mouse wheel */
 	gtk_widget_add_events (totem->win, GDK_SCROLL_MASK);
-	g_signal_connect (G_OBJECT(totem->win), "scroll_event",
-			G_CALLBACK (on_window_scroll_event), totem);
 	gtk_widget_add_events (totem->seek, GDK_SCROLL_MASK);
-	g_signal_connect (G_OBJECT (totem->seek), "scroll_event",
-			G_CALLBACK (on_window_scroll_event), totem);
 	gtk_widget_add_events (totem->fs->seek, GDK_SCROLL_MASK);
-	g_signal_connect (G_OBJECT (totem->fs->seek), "scroll_event",
-			G_CALLBACK (on_window_scroll_event), totem);
 
-	/* Sliders */
-	g_signal_connect (G_OBJECT (totem->seek), "button_press_event",
-			G_CALLBACK (seek_slider_pressed_cb), totem);
-	g_signal_connect (G_OBJECT (totem->seek), "button_release_event",
-			G_CALLBACK (seek_slider_released_cb), totem);
-	g_signal_connect (G_OBJECT (totem->seekadj), "value_changed",
-			  G_CALLBACK (seek_slider_changed_cb), totem);
-	g_signal_connect (G_OBJECT (totem->volume), "value-changed",
-			G_CALLBACK (volume_button_value_changed), totem);
-
 	/* Set sensitivity of the toolbar buttons */
 	totem_action_set_sensitivity ("play", FALSE);
 	totem_action_set_sensitivity ("next-chapter", FALSE);
@@ -2847,7 +2822,7 @@
 video_widget_create (Totem *totem) 
 {
 	GError *err = NULL;
-	GtkWidget *container;
+	GtkContainer *container;
 	BaconVideoWidget **bvw;
 	const GtkTargetEntry source_table[] = {
 		{ "text/uri-list", 0, 0 },
@@ -2905,17 +2880,17 @@
 
 	totem_missing_plugins_setup (totem);
 
-	container = glade_xml_get_widget (totem->xml, "tmw_bvw_box");
-	gtk_container_add (GTK_CONTAINER (container),
+	container = GTK_CONTAINER (gtk_builder_get_object (totem->xml, "tmw_bvw_box"));
+	gtk_container_add (container,
 			GTK_WIDGET (totem->bvw));
 
 	/* Events for the widget video window as well */
 	gtk_widget_add_events (GTK_WIDGET (totem->bvw),
 			GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
 	g_signal_connect (G_OBJECT(totem->bvw), "key_press_event",
-			G_CALLBACK (on_window_key_press_event), totem);
+			G_CALLBACK (window_key_press_event_cb), totem);
 	g_signal_connect (G_OBJECT(totem->bvw), "key_release_event",
-			G_CALLBACK (on_window_key_press_event), totem);
+			G_CALLBACK (window_key_press_event_cb), totem);
 
 	g_signal_connect (G_OBJECT (totem->bvw), "drag_data_received",
 			G_CALLBACK (drop_video_cb), totem);
@@ -3062,12 +3037,11 @@
 	}
 
 	/* Main window */
-	totem->xml = totem_interface_load ("totem.glade", _("main window"),
-			TRUE, NULL);
+	totem->xml = totem_interface_load ("totem.ui", TRUE, NULL, totem);
 	if (totem->xml == NULL)
 		totem_action_exit (NULL);
 
-	totem->win = glade_xml_get_widget (totem->xml, "totem_main_window");
+	totem->win = GTK_WIDGET (gtk_builder_get_object (totem->xml, "totem_main_window"));
 
 	/* Menubar */
 	totem_ui_manager_setup (totem);
@@ -3077,14 +3051,14 @@
 
 	/* The rest of the widgets */
 	totem->state = STATE_STOPPED;
-	totem->seek = glade_xml_get_widget (totem->xml, "tmw_seek_hscale");
+	totem->seek = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_seek_hscale"));
 	totem->seekadj = gtk_range_get_adjustment (GTK_RANGE (totem->seek));
-	totem->volume = glade_xml_get_widget (totem->xml, "tmw_volume_button");
-	totem->statusbar = glade_xml_get_widget (totem->xml, "tmw_statusbar");
+	totem->volume = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_volume_button"));
+	totem->statusbar = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_statusbar"));
 	totem->seek_lock = FALSE;
 	totem->fs = totem_fullscreen_new ();
 	gtk_scale_button_set_adjustment (GTK_SCALE_BUTTON (totem->fs->volume),
-			gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (totem->volume)));
+					 gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (totem->volume)));
 	gtk_range_set_adjustment (GTK_RANGE (totem->fs->seek), totem->seekadj);
 
 	totem_session_setup (totem, argv);
Index: src/totem-fullscreen.c
===================================================================
--- src/totem-fullscreen.c	(revision 4426)
+++ src/totem-fullscreen.c	(working copy)
@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include "totem-fullscreen.h"
 #include "totem-interface.h"
@@ -43,6 +42,12 @@
 static void     totem_fullscreen_finalize   (GObject              *object);
 static gboolean totem_fullscreen_popup_hide (TotemFullscreen      *fs);
 
+/* Callback functions for GtkBuilder */
+gboolean totem_fullscreen_vol_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+gboolean totem_fullscreen_vol_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+gboolean totem_fullscreen_seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+gboolean totem_fullscreen_seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
+
 struct TotemFullscreenPrivate {
 	BaconVideoWidget *bvw;
 	GtkWidget        *parent_window;
@@ -58,7 +63,7 @@
 	guint             popup_timeout;
 	gboolean          popup_in_progress;
 
-	GladeXML         *xml;
+	GtkBuilder       *xml;
 };
 
 G_DEFINE_TYPE(TotemFullscreen, totem_fullscreen, G_TYPE_OBJECT)
@@ -154,7 +159,7 @@
 					      G_CALLBACK (totem_fullscreen_theme_changed_cb), fs);
 }
 
-static gboolean
+gboolean
 totem_fullscreen_vol_slider_pressed_cb (GtkWidget *widget,
 					GdkEventButton *event,
 					TotemFullscreen *fs)
@@ -163,7 +168,7 @@
 	return FALSE;
 }
 
-static gboolean
+gboolean
 totem_fullscreen_vol_slider_released_cb (GtkWidget *widget,
 					 GdkEventButton *event,
 					 TotemFullscreen *fs)
@@ -172,7 +177,7 @@
 	return FALSE;
 }
 
-static gboolean
+gboolean
 totem_fullscreen_seek_slider_pressed_cb (GtkWidget *widget,
 					 GdkEventButton *event,
 					 TotemFullscreen *fs)
@@ -181,7 +186,7 @@
 	return FALSE;
 }
 
-static gboolean
+gboolean
 totem_fullscreen_seek_slider_released_cb (GtkWidget *widget,
 					  GdkEventButton *event,
 					  TotemFullscreen *fs)
@@ -249,7 +254,7 @@
 
 	/* FIXME: is this really required while we are anyway going 
 	   to do a show_all on its parent control_popup? */
-	item = glade_xml_get_widget (fs->priv->xml, "tcw_hbox");
+	item = GTK_WIDGET (gtk_builder_get_object (fs->priv->xml, "tcw_hbox"));
 	gtk_widget_show_all (item);
 	gdk_flush ();
 
@@ -294,49 +299,30 @@
 
 	priv = fs->priv;
 	priv->vol_lock = priv->seek_lock = FALSE;
-	priv->xml = totem_interface_load ("fullscreen.glade",
-					  _("fullscreen widgets"),
-					  TRUE, NULL);
+	priv->xml = totem_interface_load ("fullscreen.ui", TRUE, NULL, fs);
 
-	priv->exit_popup = glade_xml_get_widget (priv->xml,
-						 "totem_exit_fullscreen_window");
-	priv->control_popup = glade_xml_get_widget (priv->xml,
-						    "totem_controls_window");
-	fs->time_label = glade_xml_get_widget (priv->xml,
-					       "tcw_time_display_label");
-	fs->buttons_box = glade_xml_get_widget (fs->priv->xml,
-						"tcw_buttons_hbox");
-	fs->exit_button = glade_xml_get_widget (priv->xml,
-						"tefw_fs_exit_button");
+	priv->exit_popup = GTK_WIDGET (gtk_builder_get_object (priv->xml,
+				"totem_exit_fullscreen_window"));
+	priv->control_popup = GTK_WIDGET (gtk_builder_get_object (priv->xml,
+				"totem_controls_window"));
+	fs->time_label = GTK_WIDGET (gtk_builder_get_object (priv->xml,
+				"tcw_time_display_label"));
+	fs->buttons_box = GTK_WIDGET (gtk_builder_get_object (fs->priv->xml,
+				"tcw_buttons_hbox"));
+	fs->exit_button = GTK_WIDGET (gtk_builder_get_object (priv->xml,
+				"tefw_fs_exit_button"));
 
 	/* Volume */
-	fs->volume = glade_xml_get_widget (priv->xml, "tcw_volume_button");
-	g_signal_connect (G_OBJECT(fs->volume), "button_press_event",
-			  G_CALLBACK (totem_fullscreen_vol_slider_pressed_cb), fs);
-	g_signal_connect (G_OBJECT(fs->volume), "button_release_event",
-			  G_CALLBACK (totem_fullscreen_vol_slider_released_cb), fs);
+	fs->volume = GTK_WIDGET (gtk_builder_get_object (priv->xml, "tcw_volume_button"));
 	
 	/* Seek */
-	fs->seek = glade_xml_get_widget (priv->xml, "tcw_seek_hscale");
-	g_signal_connect (G_OBJECT(fs->seek), "button_press_event",
-			  G_CALLBACK (totem_fullscreen_seek_slider_pressed_cb), fs);
-	g_signal_connect (G_OBJECT(fs->seek), "button_release_event",
-			  G_CALLBACK (totem_fullscreen_seek_slider_released_cb), fs);
+	fs->seek = GTK_WIDGET (gtk_builder_get_object (priv->xml, "tcw_seek_hscale"));
 
 	/* Motion notify */
 	gtk_widget_add_events (priv->exit_popup, GDK_POINTER_MOTION_MASK);
-	g_signal_connect (G_OBJECT (priv->exit_popup), "motion-notify-event",
-			  G_CALLBACK (totem_fullscreen_motion_notify), fs);
 	gtk_widget_add_events (priv->control_popup, GDK_POINTER_MOTION_MASK);
-	g_signal_connect (G_OBJECT (priv->control_popup),
-			  "motion-notify-event",
-			  G_CALLBACK (totem_fullscreen_motion_notify), fs);
 	gtk_widget_add_events (fs->seek, GDK_POINTER_MOTION_MASK);
-	g_signal_connect (G_OBJECT (fs->seek), "motion-notify-event",
-			  G_CALLBACK (totem_fullscreen_motion_notify), fs);
 	gtk_widget_add_events (fs->exit_button, GDK_POINTER_MOTION_MASK);
-	g_signal_connect (G_OBJECT (fs->exit_button), "motion-notify-event",
-			  G_CALLBACK (totem_fullscreen_motion_notify), fs);
 
 	return fs;
 }
@@ -395,12 +381,12 @@
 void
 totem_fullscreen_set_title (TotemFullscreen *fs, const char *title)
 {
-	GtkWidget *widget;
+	GtkLabel *widget;
 	char *text;
 
 	g_return_if_fail (TOTEM_IS_FULLSCREEN (fs));
 
-	widget = glade_xml_get_widget (fs->priv->xml, "tcw_title_label");
+	widget = GTK_LABEL (gtk_builder_get_object (fs->priv->xml, "tcw_title_label"));
 
 	if (title != NULL) {
 		char *escaped;
@@ -415,7 +401,7 @@
 			 _("No File"));
 	}
 
-	gtk_label_set_markup (GTK_LABEL (widget), text);
+	gtk_label_set_markup (widget, text);
 	g_free (text);
 }
 
@@ -426,7 +412,7 @@
 
 	g_return_if_fail (TOTEM_IS_FULLSCREEN (fs));
 
-	item = glade_xml_get_widget (fs->priv->xml, "tcw_time_hbox");
+	item = GTK_WIDGET (gtk_builder_get_object (fs->priv->xml, "tcw_time_hbox"));
 	gtk_widget_set_sensitive (item, seekable);
 
 	gtk_widget_set_sensitive (fs->seek, seekable);
@@ -439,4 +425,3 @@
 
 	gtk_widget_set_sensitive (fs->volume, can_set_volume);
 }
-
Index: src/totem-interface.h
===================================================================
--- src/totem-interface.h	(revision 4426)
+++ src/totem-interface.h	(working copy)
@@ -23,22 +23,16 @@
 #ifndef TOTEM_INTERFACE_H
 #define TOTEM_INTERFACE_H
 
-#include <glade/glade.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
 GdkPixbuf	*totem_interface_load_pixbuf	(const char *name);
 char		*totem_interface_get_full_path	(const char *name);
-GladeXML	*totem_interface_load		(const char *name,
-						 const char *display_name,
+GtkBuilder	*totem_interface_load		(const char *name,
 						 gboolean fatal,
-						 GtkWindow *parent);
-GladeXML	*totem_interface_load_with_root (const char *name,
-						 const char *root_widget,
-						 const char *display_name,
-						 gboolean fatal,
-						 GtkWindow *parent);
+						 GtkWindow *parent,
+						 gpointer user_data);
 void		 totem_interface_error		(const char *title,
 						 const char *reason,
 						 GtkWindow *parent);
@@ -48,9 +42,9 @@
 void		 totem_interface_set_transient_for (GtkWindow *window,
 						    GtkWindow *parent);
 char *		 totem_interface_get_license	(void);
-void		 totem_interface_boldify_label	(GladeXML *xml,
+void		 totem_interface_boldify_label	(GtkBuilder *xml,
 						 const char *label);
-void		 totem_interface_italicise_label(GladeXML *xml,
+void		 totem_interface_italicise_label(GtkBuilder *xml,
 						 const char *label);
 
 G_END_DECLS
Index: src/totem-open-location.c
===================================================================
--- src/totem-open-location.c	(revision 4426)
+++ src/totem-open-location.c	(working copy)
@@ -47,8 +47,8 @@
 
 struct TotemOpenLocationPrivate
 {
-	GladeXML *xml;
-	GtkWidget *uri_entry;
+	GtkBuilder *xml;
+	GtkEntry *uri_entry;
 };
 
 G_DEFINE_TYPE (TotemOpenLocation, totem_open_location, GTK_TYPE_DIALOG)
@@ -109,7 +109,7 @@
 {
 	char *uri;
 
-	uri = g_strdup (gtk_entry_get_text (GTK_ENTRY (open_location->priv->uri_entry)));
+	uri = g_strdup (gtk_entry_get_text (open_location->priv->uri_entry));
 
 	if (strcmp (uri, "") == 0)
 		uri = NULL;
@@ -158,14 +158,14 @@
 
 	open_location = TOTEM_OPEN_LOCATION (g_object_new (TOTEM_TYPE_OPEN_LOCATION, NULL));
 
-	open_location->priv->xml = totem_interface_load_with_root ("uri.glade", "open_uri_dialog_content",
-				_("Open Location..."), FALSE, totem_get_main_window (totem));
+	open_location->priv->xml = totem_interface_load ("uri.ui", FALSE, totem_get_main_window (totem),
+				open_location);
 	if (open_location->priv->xml == NULL)
 	{
 		totem_open_location_finalize (G_OBJECT (open_location));
 		return NULL;
 	}
-	open_location->priv->uri_entry = glade_xml_get_widget (open_location->priv->xml, "uri");
+	open_location->priv->uri_entry = GTK_ENTRY (gtk_builder_get_object (open_location->priv->xml, "uri"));
 
 	gtk_window_set_title (GTK_WINDOW (open_location), _("Open Location..."));
 	gtk_dialog_set_has_separator (GTK_DIALOG (open_location), FALSE);
@@ -181,13 +181,13 @@
 	/* Get item from clipboard to fill GtkEntry */
 	clipboard_location = totem_open_location_set_from_clipboard (open_location);
 	if (clipboard_location != NULL && strcmp (clipboard_location, "") != 0)
-		gtk_entry_set_text (GTK_ENTRY (open_location->priv->uri_entry), clipboard_location);
+		gtk_entry_set_text (open_location->priv->uri_entry, clipboard_location);
 	g_free (clipboard_location);
 
 	/* Add items in Totem's GtkRecentManager to the URI GtkEntry's GtkEntryCompletion */
 	completion = gtk_entry_completion_new();
 	model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
-	gtk_entry_set_completion (GTK_ENTRY (open_location->priv->uri_entry), completion);
+	gtk_entry_set_completion (open_location->priv->uri_entry, completion);
 
 	recent_items = gtk_recent_manager_get_items (gtk_recent_manager_get_default ());
 
@@ -227,8 +227,8 @@
 	gtk_entry_completion_set_text_column (completion, 0);
 	gtk_entry_completion_set_match_func (completion, (GtkEntryCompletionMatchFunc) totem_open_location_match, model, NULL);
 
-	container = glade_xml_get_widget (open_location->priv->xml,
-				"open_uri_dialog_content");
+	container = GTK_WIDGET (gtk_builder_get_object (open_location->priv->xml,
+				"open_uri_dialog_content"));
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (open_location)->vbox),
 				container,
 				TRUE,       /* expand */
Index: data/mozilla-viewer.ui
===================================================================
--- data/mozilla-viewer.ui	(revision 0)
+++ data/mozilla-viewer.ui	(revision 0)
@@ -0,0 +1,171 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+
+<object class="GtkWindow" id="window">
+  <property name="title"/>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
+  <child>
+    <object class="GtkVBox" id="content_box">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<object class="GtkHBox" id="video_box">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkHBox" id="controls">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <object class="Custom" id="pp_button">
+	      <property name="visible">True</property>
+	      <property name="creation_function">totem_pp_create</property>
+	      <property name="int1">0</property>
+	      <property name="int2">0</property>
+	      <property name="last_modification_time">Sat, 16 Jun 2007 18:48:33 GMT</property>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <object class="GtkHScale" id="time_hscale">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="draw_value">False</property>
+	      <property name="value_pos">GTK_POS_TOP</property>
+	      <property name="digits">1</property>
+	      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+	      <property name="inverted">False</property>
+	      <property name="adjustment">5 0 65535 1 10 0</property>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <object class="Custom" id="volume_button">
+	      <property name="visible">True</property>
+	      <property name="creation_function">totem_volume_create</property>
+	      <property name="int1">0</property>
+	      <property name="int2">0</property>
+	      <property name="last_modification_time">Tue, 12 Jul 2005 20:30:15 GMT</property>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="Custom" id="statusbar">
+	  <property name="visible">True</property>
+	  <property name="creation_function">totem_statusbar_create</property>
+	  <property name="int1">0</property>
+	  <property name="int2">0</property>
+	  <property name="last_modification_time">Mon, 30 Oct 2006 17:29:57 GMT</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+  </child>
+</object>
+
+<object class="GtkMenu" id="menu">
+
+  <child>
+    <object class="GtkImageMenuItem" id="copy_location1">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Copy Location</property>
+      <property name="use_underline">True</property>
+      <signal handler="on_copy_location1_activate" last_modification_time="Tue, 20 Jun 2006 14:58:42 GMT" name="activate"/>
+
+      <child internal-child="image">
+	<object class="GtkImage" id="image1">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-copy</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</object>
+      </child>
+    </object>
+  </child>
+
+  <child>
+    <object class="GtkImageMenuItem" id="preferences1">
+      <property name="visible">True</property>
+      <property name="label">gtk-preferences</property>
+      <property name="use_stock">True</property>
+      <signal handler="on_preferences1_activate" last_modification_time="Tue, 12 Jul 2005 20:29:35 GMT" name="activate"/>
+    </object>
+  </child>
+
+  <child>
+    <object class="GtkSeparatorMenuItem" id="separator1">
+      <property name="visible">True</property>
+    </object>
+  </child>
+
+  <child>
+    <object class="GtkImageMenuItem" id="about1">
+      <property name="visible">True</property>
+      <property name="label">gtk-about</property>
+      <property name="use_stock">True</property>
+      <signal handler="on_about1_activate" last_modification_time="Tue, 12 Jul 2005 20:29:35 GMT" name="activate"/>
+    </object>
+  </child>
+</object>
+
+</interface>
Index: data/plugins.glade
===================================================================
--- data/plugins.glade	(revision 4426)
+++ data/plugins.glade	(working copy)
@@ -1,498 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="edit_plugins">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Rhythmbox Plugins</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="plugins_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkHBox" id="hbox3">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="plugins_list_window">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox1">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkHBox" id="header_hbox">
-		  <property name="height_request">64</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="plugin_title">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImage" id="plugin_icon">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-about</property>
-		      <property name="icon_size">6</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox2">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox4">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="description_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Description:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="description_text">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">True</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox5">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="authors_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Author:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="authors_text">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">True</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox6">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="copyright_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Copyright:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="copyright_text">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">True</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox7">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="site_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Site:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="site_text">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">True</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<placeholder/>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox1">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="configure_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment1">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox2">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image1">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-preferences</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">C_onfigure...</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
Index: data/plugins.ui
===================================================================
--- data/plugins.ui	(revision 0)
+++ data/plugins.ui	(revision 0)
@@ -0,0 +1,480 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+
+<object class="GtkVBox" id="plugins_vbox">
+  <property name="visible">True</property>
+  <property name="homogeneous">False</property>
+  <property name="spacing">0</property>
+
+  <child>
+    <object class="GtkHBox" id="hbox3">
+      <property name="border_width">6</property>
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">12</property>
+
+      <child>
+        <object class="GtkScrolledWindow" id="plugins_list_window">
+          <property name="visible">True</property>
+          <property name="can_focus">True</property>
+          <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+          <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+          <property name="shadow_type">GTK_SHADOW_IN</property>
+          <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+          <child>
+            <placeholder/>
+          </child>
+        </object>
+        <packing>
+          <property name="padding">0</property>
+          <property name="expand">False</property>
+          <property name="fill">False</property>
+        </packing>
+      </child>
+
+      <child>
+        <object class="GtkVBox" id="vbox1">
+          <property name="visible">True</property>
+          <property name="homogeneous">False</property>
+          <property name="spacing">6</property>
+
+          <child>
+    	<object class="GtkHBox" id="header_hbox">
+    	  <property name="height_request">64</property>
+    	  <property name="visible">True</property>
+    	  <property name="homogeneous">False</property>
+    	  <property name="spacing">6</property>
+
+    	  <child>
+    	    <object class="GtkLabel" id="plugin_title">
+    	      <property name="visible">True</property>
+    	      <property name="label" translatable="yes"></property>
+    	      <property name="use_underline">False</property>
+    	      <property name="use_markup">False</property>
+    	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+    	      <property name="wrap">False</property>
+    	      <property name="selectable">False</property>
+    	      <property name="xalign">0</property>
+    	      <property name="yalign">0</property>
+    	      <property name="xpad">0</property>
+    	      <property name="ypad">0</property>
+    	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    	      <property name="width_chars">-1</property>
+    	      <property name="single_line_mode">False</property>
+    	      <property name="angle">0</property>
+    	    </object>
+    	    <packing>
+    	      <property name="padding">0</property>
+    	      <property name="expand">True</property>
+    	      <property name="fill">True</property>
+    	    </packing>
+    	  </child>
+
+    	  <child>
+    	    <object class="GtkImage" id="plugin_icon">
+    	      <property name="visible">True</property>
+    	      <property name="stock">gtk-about</property>
+    	      <property name="icon_size">6</property>
+    	      <property name="xalign">0.5</property>
+    	      <property name="yalign">0</property>
+    	      <property name="xpad">0</property>
+    	      <property name="ypad">0</property>
+    	    </object>
+    	    <packing>
+    	      <property name="padding">0</property>
+    	      <property name="expand">False</property>
+    	      <property name="fill">False</property>
+    	    </packing>
+    	  </child>
+    	</object>
+    	<packing>
+    	  <property name="padding">0</property>
+    	  <property name="expand">False</property>
+    	  <property name="fill">False</property>
+    	</packing>
+          </child>
+
+          <child>
+    	<object class="GtkVBox" id="vbox2">
+    	  <property name="visible">True</property>
+    	  <property name="homogeneous">False</property>
+    	  <property name="spacing">6</property>
+
+    	  <child>
+    	    <object class="GtkVBox" id="vbox4">
+    	      <property name="visible">True</property>
+    	      <property name="homogeneous">False</property>
+    	      <property name="spacing">0</property>
+
+    	      <child>
+    		<object class="GtkLabel" id="description_label">
+    		  <property name="visible">True</property>
+    		  <property name="label" translatable="yes">Description:</property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">False</property>
+    		  <property name="selectable">False</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+
+    	      <child>
+    		<object class="GtkLabel" id="description_text">
+    		  <property name="visible">True</property>
+    		  <property name="can_focus">True</property>
+    		  <property name="label" translatable="yes"></property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">True</property>
+    		  <property name="selectable">True</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0.5</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+    	    </object>
+    	    <packing>
+    	      <property name="padding">0</property>
+    	      <property name="expand">False</property>
+    	      <property name="fill">False</property>
+    	    </packing>
+    	  </child>
+
+    	  <child>
+    	    <object class="GtkVBox" id="vbox5">
+    	      <property name="visible">True</property>
+    	      <property name="homogeneous">False</property>
+    	      <property name="spacing">0</property>
+
+    	      <child>
+    		<object class="GtkLabel" id="authors_label">
+    		  <property name="visible">True</property>
+    		  <property name="label" translatable="yes">Author:</property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">False</property>
+    		  <property name="selectable">False</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+
+    	      <child>
+    		<object class="GtkLabel" id="authors_text">
+    		  <property name="visible">True</property>
+    		  <property name="can_focus">True</property>
+    		  <property name="label" translatable="yes"></property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">True</property>
+    		  <property name="selectable">True</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0.5</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+    	    </object>
+    	    <packing>
+    	      <property name="padding">0</property>
+    	      <property name="expand">False</property>
+    	      <property name="fill">False</property>
+    	    </packing>
+    	  </child>
+
+    	  <child>
+    	    <object class="GtkVBox" id="vbox6">
+    	      <property name="visible">True</property>
+    	      <property name="homogeneous">False</property>
+    	      <property name="spacing">0</property>
+
+    	      <child>
+    		<object class="GtkLabel" id="copyright_label">
+    		  <property name="visible">True</property>
+    		  <property name="label" translatable="yes">Copyright:</property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">False</property>
+    		  <property name="selectable">False</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+
+    	      <child>
+    		<object class="GtkLabel" id="copyright_text">
+    		  <property name="visible">True</property>
+    		  <property name="can_focus">True</property>
+    		  <property name="label" translatable="yes"></property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">True</property>
+    		  <property name="selectable">True</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0.5</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+    	    </object>
+    	    <packing>
+    	      <property name="padding">0</property>
+    	      <property name="expand">False</property>
+    	      <property name="fill">False</property>
+    	    </packing>
+    	  </child>
+
+    	  <child>
+    	    <object class="GtkVBox" id="vbox7">
+    	      <property name="visible">True</property>
+    	      <property name="homogeneous">False</property>
+    	      <property name="spacing">0</property>
+
+    	      <child>
+    		<object class="GtkLabel" id="site_label">
+    		  <property name="visible">True</property>
+    		  <property name="label" translatable="yes">Site:</property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">False</property>
+    		  <property name="selectable">False</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+
+    	      <child>
+    		<object class="GtkLabel" id="site_text">
+    		  <property name="visible">True</property>
+    		  <property name="can_focus">True</property>
+    		  <property name="label" translatable="yes"></property>
+    		  <property name="use_underline">False</property>
+    		  <property name="use_markup">False</property>
+    		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    		  <property name="wrap">True</property>
+    		  <property name="selectable">True</property>
+    		  <property name="xalign">0</property>
+    		  <property name="yalign">0.5</property>
+    		  <property name="xpad">0</property>
+    		  <property name="ypad">0</property>
+    		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    		  <property name="width_chars">-1</property>
+    		  <property name="single_line_mode">False</property>
+    		  <property name="angle">0</property>
+    		</object>
+    		<packing>
+    		  <property name="padding">0</property>
+    		  <property name="expand">False</property>
+    		  <property name="fill">False</property>
+    		</packing>
+    	      </child>
+    	    </object>
+    	    <packing>
+    	      <property name="padding">0</property>
+    	      <property name="expand">False</property>
+    	      <property name="fill">False</property>
+    	    </packing>
+    	  </child>
+    	</object>
+    	<packing>
+    	  <property name="padding">0</property>
+    	  <property name="expand">True</property>
+    	  <property name="fill">True</property>
+    	</packing>
+          </child>
+
+          <child>
+    	<placeholder/>
+          </child>
+
+          <child>
+    	<object class="GtkHBox" id="hbox1">
+    	  <property name="visible">True</property>
+    	  <property name="homogeneous">False</property>
+    	  <property name="spacing">6</property>
+
+    	  <child>
+    	    <object class="GtkButton" id="configure_button">
+    	      <property name="visible">True</property>
+    	      <property name="can_focus">True</property>
+    	      <property name="relief">GTK_RELIEF_NORMAL</property>
+    	      <property name="focus_on_click">True</property>
+    	      <signal name="clicked" handler="configure_button_cb"/>
+
+    	      <child>
+    		<object class="GtkAlignment" id="alignment1">
+    		  <property name="visible">True</property>
+    		  <property name="xalign">0.5</property>
+    		  <property name="yalign">0.5</property>
+    		  <property name="xscale">0</property>
+    		  <property name="yscale">0</property>
+    		  <property name="top_padding">0</property>
+    		  <property name="bottom_padding">0</property>
+    		  <property name="left_padding">0</property>
+    		  <property name="right_padding">0</property>
+
+    		  <child>
+    		    <object class="GtkHBox" id="hbox2">
+    		      <property name="visible">True</property>
+    		      <property name="homogeneous">False</property>
+    		      <property name="spacing">2</property>
+
+    		      <child>
+    			<object class="GtkImage" id="image1">
+    			  <property name="visible">True</property>
+    			  <property name="stock">gtk-preferences</property>
+    			  <property name="icon_size">4</property>
+    			  <property name="xalign">0.5</property>
+    			  <property name="yalign">0.5</property>
+    			  <property name="xpad">0</property>
+    			  <property name="ypad">0</property>
+    			</object>
+    			<packing>
+    			  <property name="padding">0</property>
+    			  <property name="expand">False</property>
+    			  <property name="fill">False</property>
+    			</packing>
+    		      </child>
+
+    		      <child>
+    			<object class="GtkLabel" id="label2">
+    			  <property name="visible">True</property>
+    			  <property name="label" translatable="yes">C_onfigure...</property>
+    			  <property name="use_underline">True</property>
+    			  <property name="use_markup">False</property>
+    			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+    			  <property name="wrap">False</property>
+    			  <property name="selectable">False</property>
+    			  <property name="xalign">0.5</property>
+    			  <property name="yalign">0.5</property>
+    			  <property name="xpad">0</property>
+    			  <property name="ypad">0</property>
+    			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+    			  <property name="width_chars">-1</property>
+    			  <property name="single_line_mode">False</property>
+    			  <property name="angle">0</property>
+    			</object>
+    			<packing>
+    			  <property name="padding">0</property>
+    			  <property name="expand">False</property>
+    			  <property name="fill">False</property>
+    			</packing>
+    		      </child>
+    		    </object>
+    		  </child>
+    		</object>
+    	      </child>
+    	    </object>
+    	    <packing>
+    	      <property name="padding">0</property>
+    	      <property name="expand">False</property>
+    	      <property name="fill">False</property>
+    	    </packing>
+    	  </child>
+    	</object>
+    	<packing>
+    	  <property name="padding">0</property>
+    	  <property name="expand">False</property>
+    	  <property name="fill">False</property>
+    	</packing>
+          </child>
+        </object>
+        <packing>
+          <property name="padding">0</property>
+          <property name="expand">True</property>
+          <property name="fill">True</property>
+        </packing>
+      </child>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">True</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+</object>
+
+</interface>
Index: data/totem.glade
===================================================================
--- data/totem.glade	(revision 4426)
+++ data/totem.glade	(working copy)
@@ -1,1551 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="totem_preferences_window">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Totem Preferences</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="tpw_dialog_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="tpw_dialog_action_area">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="tpw_close_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="tpw_notebook">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="tpw_general_vbox">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox3">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="tpw_network_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Networking</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox6">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">12</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="tpw_speed_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Connection _speed:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">tpw_speed_combobox</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkComboBox" id="tpw_speed_combobox">
-			      <property name="visible">True</property>
-			      <property name="items" translatable="yes">14.4 Kbps Modem
-19.2 Kbps Modem
-28.8 Kbps Modem
-33.6 Kbps Modem
-34.4 Kbps Modem
-56 Kbps Modem/ISDN
-112 Kbps Dual ISDN/DSL
-256 Kbps DSL/Cable
-384 Kbps DSL/Cable
-512 Kbps DSL/Cable
-1.5 Mbps T1/Intranet/LAN
-Intranet/LAN</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox4">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="tpw_tvout_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">TV-Out</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment2">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox5">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="tpw_notvout_radio_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_No TV-out</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="tpw_nvtvntscmode_radio_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">TV-out in fullscreen by Nvidia (NTSC)</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">tpw_notvout_radio_button</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="tpw_nvtvpalmode_radio_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">TV-out in fullscreen by Nvidia (PAL)</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">tpw_notvout_radio_button</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox6">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="tpw_text_subtitles_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Text Subtitles</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment3">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="table3">
-			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">12</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label32">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Font:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">font_sel_button</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label35">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Encoding:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">subtitle_encoding_combo</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkComboBox" id="subtitle_encoding_combo">
-			      <property name="visible">True</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkFontButton" id="font_sel_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="show_style">True</property>
-			      <property name="show_size">True</property>
-			      <property name="use_font">False</property>
-			      <property name="use_size">False</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="tpw_general_notebook_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">General</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox1">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
-
-	      <child>
-		<widget class="GtkVBox" id="tpw_visuals_display_vbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="tpw_display_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Display</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment4">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="tpw_display_checkbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Automatically _resize the window when a new video is loaded</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="tpw_visuals_effects_vbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="tpw_visuals_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Visual Effects</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment5">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox9">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="tpw_visuals_checkbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show _visual effects when an audio file is played</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkTable" id="table1">
-			      <property name="visible">True</property>
-			      <property name="n_rows">2</property>
-			      <property name="n_columns">2</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">6</property>
-			      <property name="column_spacing">12</property>
-
-			      <child>
-				<widget class="GtkLabel" id="tpw_visuals_type_label">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Type of visualisation:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">tpw_visuals_type_combobox</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="tpw_visuals_size_label">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Visualisation _size:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">tpw_visuals_size_combobox</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkComboBox" id="tpw_visuals_size_combobox">
-				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">Small
-Normal
-Large
-Extra Large</property>
-				  <property name="add_tearoffs">False</property>
-				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options">fill</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkComboBox" id="tpw_visuals_type_combobox">
-				  <property name="visible">True</property>
-				  <property name="items" translatable="yes"></property>
-				  <property name="add_tearoffs">False</property>
-				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options">fill</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="tpw_bright_contr_vbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox14">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkImage" id="image7">
-			  <property name="visible">True</property>
-			  <property name="pixbuf">stock-tool-brightness-contrast-22.png</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="tpw_color_balance_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Color balance</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment6">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="table2">
-			  <property name="visible">True</property>
-			  <property name="n_rows">5</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">12</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="tpw_brightness_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Brightness:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">tpw_bright_scale</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="tpw_contrast_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Co_ntrast:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">tpw_contrast_scale</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="tpw_bright_scale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">False</property>
-			      <property name="value_pos">GTK_POS_TOP</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">32767 0 65535 1000 2000 250</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="tpw_contrast_scale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">False</property>
-			      <property name="value_pos">GTK_POS_TOP</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">32767 0 65535 1000 2000 250</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="tpw_saturation_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Sat_uration:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">tpw_saturation_scale</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="tpw_hue_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Hue:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">tpw_hue_scale</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="tpw_saturation_scale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">False</property>
-			      <property name="value_pos">GTK_POS_TOP</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">32767 0 65535 1000 2000 250</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="tpw_hue_scale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">False</property>
-			      <property name="value_pos">GTK_POS_TOP</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">32767 0 65535 1000 2000 250</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox23">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label31">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes"></property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="tpw_color_reset">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Reset To _Defaults</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">4</property>
-			      <property name="bottom_attach">5</property>
-			      <property name="x_options">shrink|fill</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="tpw_visuals_notebook_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Display</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox12">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox13">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox22">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="tpw_audio_output_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Audio Output</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment7">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">12</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox22">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
-
-			      <child>
-				<widget class="GtkLabel" id="tpw_audio_output_type_label">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Audio output type:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">tpw_sound_output_combobox</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkComboBox" id="tpw_sound_output_combobox">
-				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">Stereo
-4-channel
-4.1-channel
-5.0-channel
-5.1-channel
-AC3 Passthrough</property>
-				  <property name="add_tearoffs">False</property>
-				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label11">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Audio</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="totem_main_window">
-  <property name="title" translatable="yes">Totem Movie Player</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="totem_main_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkVBox" id="tmw_menubar_box">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <placeholder/>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHPaned" id="tmw_main_pane">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="tmw_main_vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkEventBox" id="tmw_bvw_box">
-		  <property name="visible">True</property>
-		  <property name="visible_window">True</property>
-		  <property name="above_child">False</property>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="tmw_controls_vbox">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="tmw_seek_hbox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="tmw_time_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Time:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="tmw_seek_hscale" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHScale" id="tmw_seek_hscale">
-			  <property name="visible">True</property>
-			  <property name="sensitive">False</property>
-			  <property name="can_focus">True</property>
-			  <property name="draw_value">False</property>
-			  <property name="value_pos">GTK_POS_TOP</property>
-			  <property name="digits">1</property>
-			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			  <property name="inverted">False</property>
-			  <property name="adjustment">10 0 65536 1 10 0</property>
-			  <accessibility>
-			    <atkproperty name="AtkObject::accessible_name" translatable="yes">Time seek bar</atkproperty>
-			    <atkrelation target="tmw_time_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="tmw_buttons_hbox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkHBox" id="tmw_sidebar_button_hbox">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			  <property name="pack_type">GTK_PACK_END</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="Custom" id="tmw_volume_button">
-			  <property name="visible">True</property>
-			  <property name="creation_function">totem_volume_create</property>
-			  <property name="int1">0</property>
-			  <property name="int2">0</property>
-			  <property name="last_modification_time">Fri, 06 May 2005 09:19:48 GMT</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			  <property name="pack_type">GTK_PACK_END</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="shrink">False</property>
-	      <property name="resize">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <placeholder/>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="Custom" id="tmw_statusbar">
-	  <property name="visible">True</property>
-	  <property name="creation_function">totem_statusbar_new_from_glade</property>
-	  <property name="int1">0</property>
-	  <property name="int2">0</property>
-	  <property name="last_modification_time">Sat, 18 Jan 2003 09:28:29 GMT</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
Index: data/properties.glade
===================================================================
--- data/properties.glade	(revision 4426)
+++ data/properties.glade	(working copy)
@@ -1,1158 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog1">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Properties</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="closebutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox1">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">18</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="general_vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="bvwp_general_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">General</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment1">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">12</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkTable" id="general">
-		      <property name="visible">True</property>
-		      <property name="n_rows">6</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="title_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Title:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="title" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="artist_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Artist:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="artist" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="duration_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Duration:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="duration" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="year_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Year:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="year" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="album_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Album:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="album" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="title">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Unknown</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="title_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="artist">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Unknown</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="artist_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="album">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Unknown</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="album_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="year">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Unknown</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="year_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="duration">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">0 seconds</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="duration_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="comment_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Comment:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="comment" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">5</property>
-			  <property name="bottom_attach">6</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="comment">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Unknown</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="comment_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">5</property>
-			  <property name="bottom_attach">6</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="video_vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="bvwp_video_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Video</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment2">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">12</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkTable" id="video">
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="dimensions_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Dimensions:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="dimensions" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="vcodec_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Codec:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="vcodec" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="framerate_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Framerate:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="framerate" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="vbitrate_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Bitrate:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="video_bitrate" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="dimensions">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">0 x 0</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="dimensions_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="vcodec">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">N/A</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="vcodec_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="framerate">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">0 frames per second</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="framerate_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="video_bitrate">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">0 kbps</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="vbitrate_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="audio_vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="bvwp_audio_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Audio</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment3">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">12</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkTable" id="audio">
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="samplerate_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Sample rate:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="samplerate" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="samplerate">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">0 Hz</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="samplerate_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="abitrate_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Bitrate:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="audio_bitrate" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="audio_bitrate">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">0 kbps</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="abitrate_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="acodec_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Codec:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="acodec" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="acodec">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">N/A</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="acodec_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">expand|shrink|fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="channels_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Channels:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="channels" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="channels">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">0 Channels</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">True</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="channels_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
Index: data/playlist.glade
===================================================================
--- data/playlist.glade	(revision 4426)
+++ data/playlist.glade	(working copy)
@@ -1,317 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="dialog1">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Playlist</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">300</property>
-  <property name="default_height">375</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="closebutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox4">
-	  <property name="border_width">0</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="treeview1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		  <property name="fixed_height_mode">False</property>
-		  <property name="hover_selection">False</property>
-		  <property name="hover_expand">False</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox4">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">True</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkButton" id="add_button">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Add...</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox5">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image1">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-add</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="remove_button">
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="tooltip" translatable="yes">Remove</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image4">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-remove</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="save_button">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Save Playlist...</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment2">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox6">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image2">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-save</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="up_button">
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="tooltip" translatable="yes">Move Up</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image5">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-go-up</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="down_button">
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="tooltip" translatable="yes">Move Down</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image6">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-go-down</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
Index: data/fullscreen.glade
===================================================================
--- data/fullscreen.glade	(revision 4426)
+++ data/fullscreen.glade	(working copy)
@@ -1,257 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="totem_exit_fullscreen_window">
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_POPUP</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkButton" id="tefw_fs_exit_button">
-      <property name="visible">True</property>
-      <property name="can_focus">True</property>
-      <property name="relief">GTK_RELIEF_NORMAL</property>
-      <property name="focus_on_click">True</property>
-
-      <child>
-	<widget class="GtkAlignment" id="tefw_alignment">
-	  <property name="visible">True</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xscale">0</property>
-	  <property name="yscale">0</property>
-	  <property name="top_padding">0</property>
-	  <property name="bottom_padding">0</property>
-	  <property name="left_padding">0</property>
-	  <property name="right_padding">0</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="tefw_hbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">2</property>
-
-	      <child>
-		<widget class="GtkImage" id="tefw_image">
-		  <property name="visible">True</property>
-		  <property name="icon_size">4</property>
-		  <property name="icon_name">view-restore</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="tefw_label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Leave Fullscreen</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="totem_controls_window">
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_POPUP</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_SOUTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkHBox" id="tcw_hbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
-
-      <child>
-	<widget class="GtkHBox" id="tcw_buttons_hbox">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">True</property>
-	  <property name="spacing">4</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="tcw_time_hbox">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">2</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="tcw_time_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Time:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHScale" id="tcw_seek_hscale">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="can_focus">True</property>
-	      <property name="draw_value">False</property>
-	      <property name="value_pos">GTK_POS_TOP</property>
-	      <property name="digits">1</property>
-	      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-	      <property name="inverted">False</property>
-	      <property name="adjustment">0 0 65536 1 10 0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="tcw_name_time_hbox">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">3</property>
-
-	  <child>
-	    <widget class="Custom" id="tcw_time_display_label">
-	      <property name="visible">True</property>
-	      <property name="creation_function">totem_time_label_new_from_glade</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sat, 03 Jul 2004 19:41:43 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="tcw_title_label">
-	      <property name="visible">True</property>
-	      <property name="label">No file</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">True</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="Custom" id="tcw_volume_button">
-	  <property name="visible">True</property>
-	  <property name="creation_function">totem_volume_create</property>
-	  <property name="int1">0</property>
-	  <property name="int2">0</property>
-	  <property name="last_modification_time">Fri, 06 May 2005 09:19:48 GMT</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
Index: data/playlist.ui
===================================================================
--- data/playlist.ui	(revision 0)
+++ data/playlist.ui	(revision 0)
@@ -0,0 +1,261 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+
+<object class="GtkVBox" id="vbox4">
+  <property name="border_width">0</property>
+  <property name="visible">True</property>
+  <property name="homogeneous">False</property>
+  <property name="spacing">6</property>
+
+  <child>
+    <object class="GtkScrolledWindow" id="scrolledwindow1">
+      <property name="visible">True</property>
+      <property name="can_focus">True</property>
+      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+      <property name="shadow_type">GTK_SHADOW_IN</property>
+      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+      <child>
+	<object class="GtkTreeView" id="treeview1">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="headers_visible">True</property>
+	  <property name="rules_hint">False</property>
+	  <property name="reorderable">False</property>
+	  <property name="enable_search">True</property>
+	  <property name="fixed_height_mode">False</property>
+	  <property name="hover_selection">False</property>
+	  <property name="hover_expand">False</property>
+	</object>
+      </child>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">True</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+
+  <child>
+    <object class="GtkHBox" id="hbox4">
+      <property name="visible">True</property>
+      <property name="homogeneous">True</property>
+      <property name="spacing">6</property>
+
+      <child>
+	<object class="GtkButton" id="add_button">
+	  <property name="visible">True</property>
+	  <property name="tooltip-text" translatable="yes">Add...</property>
+	  <property name="can_focus">True</property>
+	  <property name="relief">GTK_RELIEF_NORMAL</property>
+	  <property name="focus_on_click">True</property>
+	  <signal name="clicked" handler="totem_playlist_add_files"/>
+
+	  <child>
+	    <object class="GtkAlignment" id="alignment1">
+	      <property name="visible">True</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">0</property>
+	      <property name="yscale">0</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">0</property>
+	      <property name="right_padding">0</property>
+
+	      <child>
+		<object class="GtkHBox" id="hbox5">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">2</property>
+
+		  <child>
+		    <object class="GtkImage" id="image1">
+		      <property name="visible">True</property>
+		      <property name="stock">gtk-add</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <placeholder/>
+		  </child>
+		</object>
+	      </child>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkButton" id="remove_button">
+	  <property name="visible">True</property>
+	  <property name="sensitive">False</property>
+	  <property name="tooltip-text" translatable="yes">Remove</property>
+	  <property name="can_focus">True</property>
+	  <property name="relief">GTK_RELIEF_NORMAL</property>
+	  <property name="focus_on_click">True</property>
+	  <signal name="clicked" handler="playlist_remove_button_clicked"/>
+
+	  <child>
+	    <object class="GtkImage" id="image4">
+	      <property name="visible">True</property>
+	      <property name="stock">gtk-remove</property>
+	      <property name="icon_size">4</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkButton" id="save_button">
+	  <property name="visible">True</property>
+	  <property name="tooltip-text" translatable="yes">Save Playlist...</property>
+	  <property name="can_focus">True</property>
+	  <property name="relief">GTK_RELIEF_NORMAL</property>
+	  <property name="focus_on_click">True</property>
+	  <signal name="clicked" handler="totem_playlist_save_files"/>
+
+	  <child>
+	    <object class="GtkAlignment" id="alignment2">
+	      <property name="visible">True</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">0</property>
+	      <property name="yscale">0</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">0</property>
+	      <property name="right_padding">0</property>
+
+	      <child>
+		<object class="GtkHBox" id="hbox6">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">2</property>
+
+		  <child>
+		    <object class="GtkImage" id="image2">
+		      <property name="visible">True</property>
+		      <property name="stock">gtk-save</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <placeholder/>
+		  </child>
+		</object>
+	      </child>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkButton" id="up_button">
+	  <property name="visible">True</property>
+	  <property name="sensitive">False</property>
+	  <property name="tooltip-text" translatable="yes">Move Up</property>
+	  <property name="can_focus">True</property>
+	  <property name="relief">GTK_RELIEF_NORMAL</property>
+	  <property name="focus_on_click">True</property>
+	  <signal name="clicked" handler="totem_playlist_up_files"/>
+
+	  <child>
+	    <object class="GtkImage" id="image5">
+	      <property name="visible">True</property>
+	      <property name="stock">gtk-go-up</property>
+	      <property name="icon_size">4</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkButton" id="down_button">
+	  <property name="visible">True</property>
+	  <property name="sensitive">False</property>
+	  <property name="tooltip-text" translatable="yes">Move Down</property>
+	  <property name="can_focus">True</property>
+	  <property name="relief">GTK_RELIEF_NORMAL</property>
+	  <property name="focus_on_click">True</property>
+	  <signal name="clicked" handler="totem_playlist_down_files"/>
+
+	  <child>
+	    <object class="GtkImage" id="image6">
+	      <property name="visible">True</property>
+	      <property name="stock">gtk-go-down</property>
+	      <property name="icon_size">4</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">False</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+</object>
+
+</interface>
Index: data/mozilla-viewer.glade
===================================================================
--- data/mozilla-viewer.glade	(revision 4426)
+++ data/mozilla-viewer.glade	(working copy)
@@ -1,171 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="window">
-  <property name="title"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="content_box">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkHBox" id="video_box">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <placeholder/>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="controls">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="Custom" id="pp_button">
-	      <property name="visible">True</property>
-	      <property name="creation_function">totem_pp_create</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Sat, 16 Jun 2007 18:48:33 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHScale" id="time_hscale">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="draw_value">False</property>
-	      <property name="value_pos">GTK_POS_TOP</property>
-	      <property name="digits">1</property>
-	      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-	      <property name="inverted">False</property>
-	      <property name="adjustment">5 0 65535 1 10 0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="volume_button">
-	      <property name="visible">True</property>
-	      <property name="creation_function">totem_volume_create</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Tue, 12 Jul 2005 20:30:15 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="Custom" id="statusbar">
-	  <property name="visible">True</property>
-	  <property name="creation_function">totem_statusbar_create</property>
-	  <property name="int1">0</property>
-	  <property name="int2">0</property>
-	  <property name="last_modification_time">Mon, 30 Oct 2006 17:29:57 GMT</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkMenu" id="menu">
-
-  <child>
-    <widget class="GtkImageMenuItem" id="copy_location1">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Copy Location</property>
-      <property name="use_underline">True</property>
-      <signal name="activate" handler="on_copy_location1_activate" last_modification_time="Tue, 20 Jun 2006 14:58:42 GMT"/>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image1">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-copy</property>
-	  <property name="icon_size">1</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-      </child>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="preferences1">
-      <property name="visible">True</property>
-      <property name="label">gtk-preferences</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_preferences1_activate" last_modification_time="Tue, 12 Jul 2005 20:29:35 GMT"/>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkSeparatorMenuItem" id="separator1">
-      <property name="visible">True</property>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="about1">
-      <property name="visible">True</property>
-      <property name="label">gtk-about</property>
-      <property name="use_stock">True</property>
-      <signal name="activate" handler="on_about1_activate" last_modification_time="Tue, 12 Jul 2005 20:29:35 GMT"/>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
Index: data/totem.ui
===================================================================
--- data/totem.ui	(revision 0)
+++ data/totem.ui	(revision 0)
@@ -0,0 +1,1665 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+
+<object class="GtkDialog" id="totem_preferences_window">
+  <property name="border_width">5</property>
+  <property name="title" translatable="yes">Totem Preferences</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">False</property>
+
+  <child internal-child="vbox">
+    <object class="GtkVBox" id="tpw_dialog_vbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">2</property>
+
+      <child internal-child="action_area">
+	<object class="GtkHButtonBox" id="tpw_dialog_action_area">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <object class="GtkButton" id="tpw_close_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkNotebook" id="tpw_notebook">
+	  <property name="border_width">5</property>
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="show_tabs">True</property>
+	  <property name="show_border">True</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
+	  <property name="scrollable">False</property>
+	  <property name="enable_popup">False</property>
+
+	  <child>
+	    <object class="GtkVBox" id="tpw_general_vbox">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+
+	      <child>
+		<object class="GtkVBox" id="vbox3">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_network_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Networking</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment1">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkHBox" id="hbox6">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">12</property>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_speed_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Connection _speed:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_speed_combobox</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkListStore" id="tpw_speed_liststore">
+                              <columns>
+                                <column type="gchararray"/>
+                              </columns>
+                              <data>
+                                <row>
+                                  <col id="0" translatable="yes">14.4 Kbps Modem</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">19.2 Kbps Modem</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">28.8 Kbps Modem</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">33.6 Kbps Modem</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">34.4 Kbps Modem</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">56 Kbps Modem/ISDN</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">112 Kbps Dual ISDN/DSL</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">256 Kbps DSL/Cable</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">384 Kbps DSL/Cable</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">512 Kbps DSL/Cable</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">1.5 Mbps T1/Intranet/LAN</col>
+                                </row>
+                                <row>
+                                  <col id="0" translatable="yes">Intranet/LAN</col>
+                                </row>
+                              </data>
+                            </object>
+			    <object class="GtkComboBox" id="tpw_speed_combobox">
+			      <property name="visible">True</property>
+			      <property name="model">tpw_speed_liststore</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			      <signal name="changed" handler="connection_combobox_changed"/>
+			      <child>
+			        <object class="GtkCellRendererText" id="tpw_speed_cell"/>
+			        <attributes>
+			          <attribute name="text">0</attribute>
+			        </attributes>
+			      </child>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="vbox4">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_tvout_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">TV-Out</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment2">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkVBox" id="vbox5">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <object class="GtkRadioButton" id="tpw_notvout_radio_button">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">_No TV-out</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="tvout_toggled_cb"/>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkRadioButton" id="tpw_nvtvntscmode_radio_button">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">TV-out in fullscreen by Nvidia (NTSC)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">tpw_notvout_radio_button</property>
+			      <signal name="toggled" handler="tvout_toggled_cb"/>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkRadioButton" id="tpw_nvtvpalmode_radio_button">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">TV-out in fullscreen by Nvidia (PAL)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">tpw_notvout_radio_button</property>
+			      <signal name="toggled" handler="tvout_toggled_cb"/>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="vbox6">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_text_subtitles_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Text Subtitles</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment3">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkTable" id="table3">
+			  <property name="visible">True</property>
+			  <property name="n_rows">2</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
+
+			  <child>
+			    <object class="GtkLabel" id="label32">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Font:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">font_sel_button</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="label35">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Encoding:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">subtitle_encoding_combo</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkComboBox" id="subtitle_encoding_combo">
+			      <property name="visible">True</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			      <signal name="changed" handler="encoding_set_cb"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkFontButton" id="font_sel_button">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="show_style">True</property>
+			      <property name="show_size">True</property>
+			      <property name="use_font">False</property>
+			      <property name="use_size">False</property>
+			      <property name="focus_on_click">True</property>
+			      <signal name="font-set" handler="font_set_cb"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child type="tab">
+	    <object class="GtkLabel" id="tpw_general_notebook_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">General</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    
+	  </child>
+
+	  <child>
+	    <object class="GtkVBox" id="vbox1">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+
+	      <child>
+		<object class="GtkVBox" id="tpw_visuals_display_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_display_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Display</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment4">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkCheckButton" id="tpw_display_checkbutton">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Automatically _resize the window when a new video is loaded</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="checkbutton1_toggled_cb"/>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="tpw_visuals_effects_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_visuals_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Visual Effects</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment5">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkVBox" id="vbox9">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <object class="GtkCheckButton" id="tpw_visuals_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Show _visual effects when an audio file is played</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="checkbutton2_toggled_cb"/>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkTable" id="table1">
+			      <property name="visible">True</property>
+			      <property name="n_rows">2</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<object class="GtkLabel" id="tpw_visuals_type_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Type of visualisation:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">tpw_visuals_type_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</object>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"/>
+				</packing>
+			      </child>
+
+			      <child>
+				<object class="GtkLabel" id="tpw_visuals_size_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Visualisation _size:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">tpw_visuals_size_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</object>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"/>
+				</packing>
+			      </child>
+
+			      <child>
+			        <object class="GtkListStore" id="tpw_visuals_size_liststore">
+                                  <columns>
+                                    <column type="gchararray"/>
+                                  </columns>
+                                  <data>
+                                    <row>
+                                      <col id="0" translatable="yes">Normal</col>
+                                    </row>
+                                    <row>
+                                      <col id="0" translatable="yes">Large</col>
+                                    </row>
+                                    <row>
+                                      <col id="0" translatable="yes">Extra Large</col>
+                                    </row>
+                                  </data>
+                                </object>
+				<object class="GtkComboBox" id="tpw_visuals_size_combobox">
+				  <property name="visible">True</property>
+				  <property name="model">tpw_visuals_size_liststore</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
+				  <signal name="changed" handler="visual_quality_menu_changed"/>
+				  <child>
+				    <object class="GtkCellRendererText" id="tpw_visuals_size_cell"/>
+				    <attributes>
+				      <attribute name="text">0</attribute>
+				    </attributes>
+				  </child>
+				</object>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options">fill</property>
+				</packing>
+			      </child>
+
+			      <child>
+			        <object class="GtkListStore" id="tpw_visuals_type_liststore">
+                                  <columns>
+                                    <column type="gchararray"/>
+                                  </columns>
+                                  <data>
+                                  </data>
+                                </object>
+				<object class="GtkComboBox" id="tpw_visuals_type_combobox">
+				  <property name="visible">True</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="model">tpw_visuals_type_liststore</property>
+				  <signal name="changed" handler="visual_menu_changed"/>
+				</object>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options">fill</property>
+				</packing>
+			      </child>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="tpw_bright_contr_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <object class="GtkHBox" id="hbox14">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<object class="GtkImage" id="image7">
+			  <property name="visible">True</property>
+			  <property name="file">stock-tool-brightness-contrast-22.png</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<object class="GtkLabel" id="tpw_color_balance_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Color Balance</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment6">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkTable" id="table2">
+			  <property name="visible">True</property>
+			  <property name="n_rows">5</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_brightness_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Brightness:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_bright_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_contrast_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Co_ntrast:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_contrast_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkAdjustment" id="tpw_bright_adjustment">
+		              <property name="lower">0</property>
+		              <property name="upper">65535</property>
+		              <property name="step-increment">1000</property>
+		              <property name="page-increment">2000</property>
+		              <property name="page-size">250</property>
+		              <property name="value">32767</property>
+		            </object>
+			    <object class="GtkHScale" id="tpw_bright_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_bright_adjustment</property>
+			      <signal name="value-changed" handler="brightness_changed"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkAdjustment" id="tpw_contrast_adjustment">
+		              <property name="lower">0</property>
+		              <property name="upper">65535</property>
+		              <property name="step-increment">1000</property>
+		              <property name="page-increment">2000</property>
+		              <property name="page-size">250</property>
+		              <property name="value">32767</property>
+		            </object>
+			    <object class="GtkHScale" id="tpw_contrast_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_contrast_adjustment</property>
+			      <signal name="value-changed" handler="contrast_changed"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_saturation_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Sat_uration:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_saturation_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_hue_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Hue:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_hue_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkAdjustment" id="tpw_saturation_adjustment">
+		              <property name="lower">0</property>
+		              <property name="upper">65535</property>
+		              <property name="step-increment">1000</property>
+		              <property name="page-increment">2000</property>
+		              <property name="page-size">250</property>
+		              <property name="value">32767</property>
+		            </object>
+			    <object class="GtkHScale" id="tpw_saturation_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_saturation_adjustment</property>
+			      <signal name="value-changed" handler="saturation_changed"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkAdjustment" id="tpw_hue_adjustment">
+		              <property name="lower">0</property>
+		              <property name="upper">65535</property>
+		              <property name="step-increment">1000</property>
+		              <property name="page-increment">2000</property>
+		              <property name="page-size">250</property>
+		              <property name="value">32767</property>
+		            </object>
+			    <object class="GtkHScale" id="tpw_hue_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_hue_adjustment</property>
+			      <signal name="value-changed" handler="hue_changed"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkHButtonBox" id="hbox23">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+			      <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+			      <child>
+				<object class="GtkButton" id="tpw_color_reset">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Reset To _Defaults</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <signal name="clicked" handler="tpw_color_reset_clicked_cb"/>
+				</object>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">4</property>
+			      <property name="bottom_attach">5</property>
+			      <property name="x_options">shrink|fill</property>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child type="tab">
+	    <object class="GtkLabel" id="tpw_visuals_notebook_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Display</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    
+	  </child>
+
+	  <child>
+	    <object class="GtkVBox" id="vbox12">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+
+	      <child>
+		<object class="GtkVBox" id="vbox13">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <object class="GtkVBox" id="vbox22">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<object class="GtkLabel" id="tpw_audio_output_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Audio Output</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<object class="GtkAlignment" id="alignment7">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
+
+			  <child>
+			    <object class="GtkHBox" id="hbox22">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">12</property>
+
+			      <child>
+				<object class="GtkLabel" id="tpw_audio_output_type_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Audio output type:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">tpw_sound_output_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</object>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+			        <object class="GtkListStore" id="tpw_sound_output_liststore">
+                                  <columns>
+                                    <column type="gchararray"/>
+                                  </columns>
+                                  <data>
+                                    <row>
+                                      <col id="0" translatable="yes">Stereo</col>
+                                    </row>
+                                    <row>
+                                      <col id="0" translatable="yes">4-channel</col>
+                                    </row>
+                                    <row>
+                                      <col id="0" translatable="yes">4.1-channel</col>
+                                    </row>
+                                    <row>
+                                      <col id="0" translatable="yes">5.0-channel</col>
+                                    </row>
+                                    <row>
+                                      <col id="0" translatable="yes">5.1-channel</col>
+                                    </row>
+                                    <row>
+                                      <col id="0" translatable="yes">AC3 Passthrough</col>
+                                    </row>
+                                  </data>
+                                </object>
+				<object class="GtkComboBox" id="tpw_sound_output_combobox">
+				  <property name="visible">True</property>
+				  <property name="model">tpw_sound_output_liststore</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
+				  <signal name="changed" handler="audio_out_menu_changed"/>
+				  <child>
+				    <object class="GtkCellRendererText" id="tpw_sound_output_cell"/>
+				    <attributes>
+				      <attribute name="text">0</attribute>
+				    </attributes>
+				  </child>
+				</object>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </object>
+			  </child>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <placeholder/>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child type="tab">
+	    <object class="GtkLabel" id="label11">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Audio</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+  </child>
+<action-widgets><action-widget response="-7">tpw_close_button</action-widget></action-widgets></object>
+
+<object class="GtkWindow" id="totem_main_window">
+  <property name="title" translatable="yes">Totem Movie Player</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="delete-event" handler="main_window_destroy_cb"/>
+  <signal name="window-state-event" handler="window_state_event_cb"/>
+  <signal name="key-press-event" handler="window_key_press_event_cb"/>
+  <signal name="key-release-event" handler="window_key_press_event_cb"/>
+  <signal name="scroll-event" handler="window_scroll_event_cb"/>
+
+  <child>
+    <object class="GtkVBox" id="totem_main_vbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<object class="GtkVBox" id="tmw_menubar_box">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkHPaned" id="tmw_main_pane">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <signal name="size-allocate" handler="main_pane_size_allocated"/>
+
+	  <child>
+	    <object class="GtkVBox" id="tmw_main_vbox">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<object class="GtkEventBox" id="tmw_bvw_box">
+		  <property name="visible">True</property>
+		  <property name="visible_window">True</property>
+		  <property name="above_child">False</property>
+
+		  <child>
+		    <placeholder/>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="tmw_controls_vbox">
+		  <property name="border_width">6</property>
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <object class="GtkHBox" id="tmw_seek_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<object class="GtkLabel" id="tmw_time_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Time:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			  
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+		        <object class="GtkAdjustment" id="tmw_seek_adjustment">
+		          <property name="lower">0</property>
+		          <property name="upper">65535</property>
+		          <property name="step-increment">1</property>
+		          <property name="page-increment">10</property>
+		          <property name="page-size">0</property>
+		          <property name="value">10</property>
+		          <signal name="value-changed" handler="seek_slider_changed_cb"/>
+		        </object>
+			<object class="GtkHScale" id="tmw_seek_hscale">
+			  <property name="visible">True</property>
+			  <property name="sensitive">False</property>
+			  <property name="can_focus">True</property>
+			  <property name="draw_value">False</property>
+			  <property name="value_pos">GTK_POS_TOP</property>
+			  <property name="digits">1</property>
+			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			  <property name="inverted">False</property>
+			  <property name="adjustment">tmw_seek_adjustment</property>
+			  <signal name="button-press-event" handler="seek_slider_pressed_cb"/>
+			  <signal name="button-release-event" handler="seek_slider_released_cb"/>
+			  <signal name="scroll-event" handler="window_scroll_event_cb"/>
+			  
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkHBox" id="tmw_buttons_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<object class="GtkHBox" id="tmw_sidebar_button_hbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<object class="GtkVolumeButton" id="tmw_volume_button">
+			  <property name="visible">True</property>
+			  <signal name="value-changed" handler="volume_button_value_changed_cb"/>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="shrink">False</property>
+	      <property name="resize">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="TotemStatusbar" id="tmw_statusbar">
+	  <property name="visible">True</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+  </child>
+</object>
+
+</interface>
Index: data/properties.ui
===================================================================
--- data/properties.ui	(revision 0)
+++ data/properties.ui	(revision 0)
@@ -0,0 +1,1043 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+
+<object class="GtkVBox" id="vbox1">
+  <property name="border_width">6</property>
+  <property name="visible">True</property>
+  <property name="homogeneous">False</property>
+  <property name="spacing">18</property>
+
+  <child>
+    <object class="GtkVBox" id="general_vbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">6</property>
+
+      <child>
+	<object class="GtkLabel" id="bvwp_general_label">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">General</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">True</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkAlignment" id="alignment1">
+	  <property name="visible">True</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xscale">1</property>
+	  <property name="yscale">1</property>
+	  <property name="top_padding">0</property>
+	  <property name="bottom_padding">0</property>
+	  <property name="left_padding">12</property>
+	  <property name="right_padding">0</property>
+
+	  <child>
+	    <object class="GtkTable" id="general">
+	      <property name="visible">True</property>
+	      <property name="n_rows">6</property>
+	      <property name="n_columns">2</property>
+	      <property name="homogeneous">False</property>
+	      <property name="row_spacing">6</property>
+	      <property name="column_spacing">12</property>
+
+	      <child>
+		<object class="GtkLabel" id="title_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Title:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="artist_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Artist:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="duration_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Duration:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">4</property>
+		  <property name="bottom_attach">5</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="year_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Year:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="album_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Album:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="title">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Unknown</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="artist">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Unknown</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="album">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Unknown</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="year">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Unknown</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="duration">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">0 seconds</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">4</property>
+		  <property name="bottom_attach">5</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="comment_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Comment:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">5</property>
+		  <property name="bottom_attach">6</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="comment">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Unknown</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">5</property>
+		  <property name="bottom_attach">6</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">True</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+
+  <child>
+    <object class="GtkVBox" id="video_vbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">6</property>
+
+      <child>
+	<object class="GtkLabel" id="bvwp_video_label">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">Video</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">True</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkAlignment" id="alignment2">
+	  <property name="visible">True</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xscale">1</property>
+	  <property name="yscale">1</property>
+	  <property name="top_padding">0</property>
+	  <property name="bottom_padding">0</property>
+	  <property name="left_padding">12</property>
+	  <property name="right_padding">0</property>
+
+	  <child>
+	    <object class="GtkTable" id="video">
+	      <property name="visible">True</property>
+	      <property name="n_rows">4</property>
+	      <property name="n_columns">2</property>
+	      <property name="homogeneous">False</property>
+	      <property name="row_spacing">6</property>
+	      <property name="column_spacing">12</property>
+
+	      <child>
+		<object class="GtkLabel" id="dimensions_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Dimensions:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="vcodec_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Codec:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="framerate_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Framerate:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="vbitrate_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Bitrate:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="dimensions">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">0 x 0</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="vcodec">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">N/A</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="framerate">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">0 frames per second</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="video_bitrate">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">0 kbps</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">True</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+
+  <child>
+    <object class="GtkVBox" id="audio_vbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">6</property>
+
+      <child>
+	<object class="GtkLabel" id="bvwp_audio_label">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">Audio</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">True</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkAlignment" id="alignment3">
+	  <property name="visible">True</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xscale">1</property>
+	  <property name="yscale">1</property>
+	  <property name="top_padding">0</property>
+	  <property name="bottom_padding">0</property>
+	  <property name="left_padding">12</property>
+	  <property name="right_padding">0</property>
+
+	  <child>
+	    <object class="GtkTable" id="audio">
+	      <property name="visible">True</property>
+	      <property name="n_rows">4</property>
+	      <property name="n_columns">2</property>
+	      <property name="homogeneous">False</property>
+	      <property name="row_spacing">6</property>
+	      <property name="column_spacing">12</property>
+
+	      <child>
+		<object class="GtkLabel" id="samplerate_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Sample rate:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="samplerate">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">0 Hz</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="abitrate_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Bitrate:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="audio_bitrate">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">0 kbps</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="acodec_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Codec:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="acodec">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">N/A</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="channels_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Channels:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="channels">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">0 Channels</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">True</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		  
+		</object>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"/>
+		</packing>
+	      </child>
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">True</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+</object>
+
+</interface>
Index: data/Makefile.am
===================================================================
--- data/Makefile.am	(revision 4426)
+++ data/Makefile.am	(working copy)
@@ -8,14 +8,14 @@
 	filmholes-big-left.png		\
 	filmholes-big-right.png		\
 	stock-tool-brightness-contrast-22.png	\
-	totem.glade			\
-	fullscreen.glade		\
-	playlist.glade			\
+	totem.ui			\
+	fullscreen.ui			\
+	playlist.ui			\
 	playlist-ui.xml			\
-	plugins.glade			\
-	mozilla-viewer.glade		\
-	properties.glade		\
-	uri.glade			\
+	plugins.ui			\
+	mozilla-viewer.ui		\
+	properties.ui			\
+	uri.ui				\
 	totem-ui.xml			\
 	totem_logo.png
 
@@ -95,7 +95,7 @@
 	totem-video-thumbnailer.pod
 
 CLEANFILES = \
-	*.bak *.gladep core* *.orig *~ 	\
+	*.bak *.uip core* *.orig *~ 	\
 	$(desktop_in_files)		\
 	$(desktop_DATA)			\
 	$(generated_schema_in_files)	\
Index: data/uri.glade
===================================================================
--- data/uri.glade	(revision 4426)
+++ data/uri.glade	(working copy)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="open_uri_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Open Location...</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="open_uri_dialog_content">
-            <property name="visible">True</property>
-            <property name="border_width">5</property>
-            <property name="spacing">6</property>
-            <child>
-              <widget class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Enter the _address of the file you would like to open:</property>
-                <property name="use_underline">True</property>
-                <property name="wrap">True</property>
-                <property name="mnemonic_widget">uri</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="uri">
-                <property name="visible">True</property>
-                <property name="activates_default">True</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="cancel_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="open_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-open</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
Index: data/uri.ui
===================================================================
--- data/uri.ui	(revision 0)
+++ data/uri.ui	(revision 0)
@@ -0,0 +1,33 @@
+<?xml version="1.0" ?>
+<!DOCTYPE glade-interface
+  SYSTEM 'glade-2.0.dtd'>
+<!--*- mode: xml -*--><interface>
+<object class="GtkVBox" id="open_uri_dialog_content">
+  <property name="visible">True</property>
+  <property name="border_width">5</property>
+  <property name="spacing">6</property>
+  <child>
+    <object class="GtkLabel" id="label1">
+      <property name="visible">True</property>
+      <property name="xalign">0</property>
+      <property name="label" translatable="yes">Enter the _address of the file you would like to open:</property>
+      <property name="use_underline">True</property>
+      <property name="wrap">True</property>
+      <property name="mnemonic_widget">uri</property>
+    </object>
+    <packing>
+      <property name="expand">False</property>
+      <property name="fill">False</property>
+    </packing>
+  </child>
+  <child>
+    <object class="GtkEntry" id="uri">
+      <property name="visible">True</property>
+      <property name="activates_default">True</property>
+    </object>
+    <packing>
+      <property name="position">1</property>
+    </packing>
+  </child>
+</object>
+</interface>
Index: data/fullscreen.ui
===================================================================
--- data/fullscreen.ui	(revision 0)
+++ data/fullscreen.ui	(revision 0)
@@ -0,0 +1,265 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+
+<object class="GtkWindow" id="totem_exit_fullscreen_window">
+  <property name="title" translatable="yes"></property>
+  <property name="type">GTK_WINDOW_POPUP</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="motion-notify-event" handler="totem_fullscreen_motion_notify"/>
+
+  <child>
+    <object class="GtkButton" id="tefw_fs_exit_button">
+      <property name="visible">True</property>
+      <property name="can_focus">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+      <signal name="motion-notify-event" handler="totem_fullscreen_motion_notify"/>
+
+      <child>
+	<object class="GtkAlignment" id="tefw_alignment">
+	  <property name="visible">True</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xscale">0</property>
+	  <property name="yscale">0</property>
+	  <property name="top_padding">0</property>
+	  <property name="bottom_padding">0</property>
+	  <property name="left_padding">0</property>
+	  <property name="right_padding">0</property>
+
+	  <child>
+	    <object class="GtkHBox" id="tefw_hbox">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">2</property>
+
+	      <child>
+		<object class="GtkImage" id="tefw_image">
+		  <property name="visible">True</property>
+		  <property name="icon_size">4</property>
+		  <property name="icon_name">view-restore</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkLabel" id="tefw_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Leave Fullscreen</property>
+		  <property name="use_underline">True</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </object>
+	  </child>
+	</object>
+      </child>
+    </object>
+  </child>
+</object>
+
+<object class="GtkWindow" id="totem_controls_window">
+  <property name="title" translatable="yes"></property>
+  <property name="type">GTK_WINDOW_POPUP</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_SOUTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="motion-notify-event" handler="totem_fullscreen_motion_notify"/>
+
+  <child>
+    <object class="GtkHBox" id="tcw_hbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">4</property>
+
+      <child>
+	<object class="GtkHBox" id="tcw_buttons_hbox">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">True</property>
+	  <property name="spacing">4</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkHBox" id="tcw_time_hbox">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">2</property>
+
+	  <child>
+	    <object class="GtkLabel" id="tcw_time_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Time:</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <object class="GtkAdjustment" id="tcw_seek_adjustment">
+              <property name="lower">0</property>
+              <property name="upper">65535</property>
+              <property name="step-increment">1</property>
+              <property name="page-increment">10</property>
+              <property name="page-size">0</property>
+              <property name="value">0</property>
+            </object>
+	    <object class="GtkHScale" id="tcw_seek_hscale">
+	      <property name="visible">True</property>
+	      <property name="sensitive">False</property>
+	      <property name="can_focus">True</property>
+	      <property name="draw_value">False</property>
+	      <property name="value_pos">GTK_POS_TOP</property>
+	      <property name="digits">1</property>
+	      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+	      <property name="inverted">False</property>
+	      <property name="adjustment">tcw_seek_adjustment</property>
+	      <signal name="button-press-event" handler="totem_fullscreen_seek_slider_pressed_cb"/>
+	      <signal name="button-release-event" handler="totem_fullscreen_seek_slider_released_cb"/>
+	      <signal name="motion-notify-event" handler="totem_fullscreen_motion_notify"/>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkHBox" id="tcw_name_time_hbox">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">3</property>
+
+	  <child>
+	    <object class="TotemTimeLabel" id="tcw_time_display_label">
+	      <property name="visible">True</property>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <object class="GtkLabel" id="tcw_title_label">
+	      <property name="visible">True</property>
+	      <property name="label">No file</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">True</property>
+	      <property name="angle">0</property>
+	    </object>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkVolumeButton" id="tcw_volume_button">
+	  <property name="visible">True</property>
+	  <signal name="button-press-event" handler="totem_fullscreen_vol_slider_pressed_cb"/>
+	  <signal name="button-release-event" handler="totem_fullscreen_vol_slider_released_cb"/>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+  </child>
+</object>
+
+</interface>
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 4426)
+++ po/POTFILES.in	(working copy)
@@ -1,14 +1,14 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-data/fullscreen.glade
-data/playlist.glade
-data/plugins.glade
-data/properties.glade
+data/fullscreen.ui
+data/playlist.ui
+data/plugins.ui
+data/properties.ui
 data/totem.desktop.in.in.in
-data/totem.glade
+data/totem.ui
 data/totem.schemas.in
-data/uri.glade
+data/uri.ui
 lib/totem-scrsaver.c
 src/totem-fullscreen.c
 src/totem-interface.c
@@ -51,5 +51,5 @@
 [type: gettext/ini]src/plugins/skipto/skipto.totem-plugin.in
 src/plugins/skipto/totem-skipto.c
 src/plugins/skipto/totem-skipto-plugin.c
-src/plugins/skipto/skip_to.glade
+src/plugins/skipto/skip_to.ui
 browser-plugin/totem-plugin-viewer.c
Index: po/POTFILES.skip
===================================================================
--- po/POTFILES.skip	(revision 4426)
+++ po/POTFILES.skip	(working copy)
@@ -1,4 +1,4 @@
-data/mozilla-viewer.glade
+data/mozilla-viewer.ui
 data/totem-handlers.schemas.in
 data/totem-video-thumbnail.schemas.in
 data/totem.desktop.in
