5a644f9
diff --git a/configure.ac b/configure.ac
5a644f9
index 1eb840a..30d0a8f 100644
5a644f9
--- a/configure.ac
5a644f9
+++ b/configure.ac
5a644f9
@@ -43,7 +43,6 @@ GTK_REQUIRED_VERSION=2.11.5
5a644f9
 LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
5a644f9
 GNOME_DESKTOP_REQUIRED_VERSION=2.23.2
5a644f9
 
5a644f9
-GLADE_REQUIRED_VERSION=2.5.0
5a644f9
 LIBGNOMEKBDUI_REQUIRED_VERSION=0.1
5a644f9
 
5a644f9
 AC_CHECK_HEADERS(unistd.h)
5a644f9
@@ -64,7 +63,6 @@ AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
5a644f9
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
5a644f9
 
5a644f9
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG,
5a644f9
-        libglade-2.0 >= $GLADE_REQUIRED_VERSION
5a644f9
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
5a644f9
         gthread-2.0
5a644f9
         gtk+-2.0 >= $GTK_REQUIRED_VERSION)
5a644f9
@@ -74,7 +72,6 @@ AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS)
5a644f9
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_CAPPLET,
5a644f9
         gio-2.0 >= $GLIB_REQUIRED_VERSION
5a644f9
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
5a644f9
-        libglade-2.0 >= $GLADE_REQUIRED_VERSION
5a644f9
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
5a644f9
         libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
5a644f9
 AC_SUBST(GNOME_SCREENSAVER_CAPPLET_CFLAGS)
5a644f9
diff --git a/data/Makefile.am b/data/Makefile.am
5a644f9
index 87d46d6..9833cae 100644
5a644f9
--- a/data/Makefile.am
5a644f9
+++ b/data/Makefile.am
5a644f9
@@ -34,10 +34,10 @@ menu_DATA =					\
5a644f9
 	gnome-screensavers.menu			\
5a644f9
 	$(NULL)
5a644f9
 
5a644f9
-gladedir = $(pkgdatadir)
5a644f9
-glade_DATA = 					\
5a644f9
-	gnome-screensaver-preferences.glade	\
5a644f9
-	lock-dialog-default.glade		\
5a644f9
+gtkbuilderdir = $(pkgdatadir)
5a644f9
+gtkbuilder_DATA = 					\
5a644f9
+	gnome-screensaver-preferences.ui	\
5a644f9
+	lock-dialog-default.ui		\
5a644f9
 	$(NULL)
5a644f9
 
5a644f9
 pkgconfigdir = $(libdir)/pkgconfig
5a644f9
diff --git a/data/gnome-screensaver-preferences.glade b/data/gnome-screensaver-preferences.glade
5a644f9
deleted file mode 100644
5a644f9
index 574e142..0000000
5a644f9
--- a/data/gnome-screensaver-preferences.glade
5a644f9
+++ /dev/null
5a644f9
@@ -1,760 +0,0 @@
5a644f9
- 
5a644f9
-
5a644f9
-
5a644f9
-<glade-interface>
5a644f9
-
5a644f9
-<widget class="GtkDialog" id="prefs_dialog">
5a644f9
-  <property name="border_width">5</property>
5a644f9
-  <property name="visible">True</property>
5a644f9
-  <property name="title" translatable="yes">Screensaver Preferences</property>
5a644f9
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
5a644f9
-  <property name="window_position">GTK_WIN_POS_NONE</property>
5a644f9
-  <property name="modal">False</property>
5a644f9
-  <property name="default_width">600</property>
5a644f9
-  <property name="default_height">400</property>
5a644f9
-  <property name="resizable">True</property>
5a644f9
-  <property name="destroy_with_parent">False</property>
5a644f9
-  <property name="decorated">True</property>
5a644f9
-  <property name="skip_taskbar_hint">False</property>
5a644f9
-  <property name="skip_pager_hint">False</property>
5a644f9
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
5a644f9
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5a644f9
-  <property name="focus_on_map">True</property>
5a644f9
-  <property name="urgency_hint">False</property>
5a644f9
-  <property name="has_separator">False</property>
5a644f9
-
5a644f9
-  <child internal-child="vbox">
5a644f9
-    <widget class="GtkVBox" id="dialog-vbox1">
5a644f9
-      <property name="visible">True</property>
5a644f9
-      <property name="homogeneous">False</property>
5a644f9
-      <property name="spacing">2</property>
5a644f9
-
5a644f9
-      <child internal-child="action_area">
5a644f9
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
5a644f9
-	  <property name="visible">True</property>
5a644f9
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkButton" id="helpbutton1">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="can_default">True</property>
5a644f9
-	      <property name="can_focus">True</property>
5a644f9
-	      <property name="label">gtk-help</property>
5a644f9
-	      <property name="use_stock">True</property>
5a644f9
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-	      <property name="focus_on_click">True</property>
5a644f9
-	      <property name="response_id">-11</property>
5a644f9
-	    </widget>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkButton" id="gpm_button">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="can_default">True</property>
5a644f9
-	      <property name="can_focus">True</property>
5a644f9
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-	      <property name="focus_on_click">True</property>
5a644f9
-	      <property name="response_id">-2</property>
5a644f9
-
5a644f9
-	      <child>
5a644f9
-		<widget class="GtkAlignment" id="alignment2">
5a644f9
-		  <property name="visible">True</property>
5a644f9
-		  <property name="xalign">0.5</property>
5a644f9
-		  <property name="yalign">0.5</property>
5a644f9
-		  <property name="xscale">0</property>
5a644f9
-		  <property name="yscale">0</property>
5a644f9
-		  <property name="top_padding">0</property>
5a644f9
-		  <property name="bottom_padding">0</property>
5a644f9
-		  <property name="left_padding">0</property>
5a644f9
-		  <property name="right_padding">0</property>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkHBox" id="hbox11">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="homogeneous">False</property>
5a644f9
-		      <property name="spacing">2</property>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkImage" id="image6">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="stock">gtk-jump-to</property>
5a644f9
-			  <property name="icon_size">4</property>
5a644f9
-			  <property name="xalign">0.5</property>
5a644f9
-			  <property name="yalign">0.5</property>
5a644f9
-			  <property name="xpad">0</property>
5a644f9
-			  <property name="ypad">0</property>
5a644f9
-			</widget>
5a644f9
-			<packing>
5a644f9
-			  <property name="padding">0</property>
5a644f9
-			  <property name="expand">False</property>
5a644f9
-			  <property name="fill">False</property>
5a644f9
-			</packing>
5a644f9
-		      </child>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkLabel" id="label16">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="label" translatable="yes">Power _Management</property>
5a644f9
-			  <property name="use_underline">True</property>
5a644f9
-			  <property name="use_markup">False</property>
5a644f9
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-			  <property name="wrap">False</property>
5a644f9
-			  <property name="selectable">False</property>
5a644f9
-			  <property name="xalign">0.5</property>
5a644f9
-			  <property name="yalign">0.5</property>
5a644f9
-			  <property name="xpad">0</property>
5a644f9
-			  <property name="ypad">0</property>
5a644f9
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-			  <property name="width_chars">-1</property>
5a644f9
-			  <property name="single_line_mode">False</property>
5a644f9
-			  <property name="angle">0</property>
5a644f9
-			</widget>
5a644f9
-			<packing>
5a644f9
-			  <property name="padding">0</property>
5a644f9
-			  <property name="expand">False</property>
5a644f9
-			  <property name="fill">False</property>
5a644f9
-			</packing>
5a644f9
-		      </child>
5a644f9
-		    </widget>
5a644f9
-		  </child>
5a644f9
-		</widget>
5a644f9
-	      </child>
5a644f9
-	    </widget>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkButton" id="button1">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="can_default">True</property>
5a644f9
-	      <property name="can_focus">True</property>
5a644f9
-	      <property name="label">gtk-close</property>
5a644f9
-	      <property name="use_stock">True</property>
5a644f9
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-	      <property name="focus_on_click">True</property>
5a644f9
-	      <property name="response_id">-7</property>
5a644f9
-	    </widget>
5a644f9
-	  </child>
5a644f9
-	</widget>
5a644f9
-	<packing>
5a644f9
-	  <property name="padding">0</property>
5a644f9
-	  <property name="expand">False</property>
5a644f9
-	  <property name="fill">True</property>
5a644f9
-	  <property name="pack_type">GTK_PACK_END</property>
5a644f9
-	</packing>
5a644f9
-      </child>
5a644f9
-
5a644f9
-      <child>
5a644f9
-	<widget class="GtkVBox" id="vbox1">
5a644f9
-	  <property name="border_width">5</property>
5a644f9
-	  <property name="visible">True</property>
5a644f9
-	  <property name="homogeneous">False</property>
5a644f9
-	  <property name="spacing">12</property>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkHBox" id="hbox1">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="homogeneous">False</property>
5a644f9
-	      <property name="spacing">12</property>
5a644f9
-
5a644f9
-	      <child>
5a644f9
-		<widget class="GtkVBox" id="vbox8">
5a644f9
-		  <property name="visible">True</property>
5a644f9
-		  <property name="homogeneous">False</property>
5a644f9
-		  <property name="spacing">6</property>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkLabel" id="savers_label">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="label" translatable="yes">_Screensaver theme:</property>
5a644f9
-		      <property name="use_underline">True</property>
5a644f9
-		      <property name="use_markup">True</property>
5a644f9
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-		      <property name="wrap">False</property>
5a644f9
-		      <property name="selectable">False</property>
5a644f9
-		      <property name="xalign">0</property>
5a644f9
-		      <property name="yalign">0.5</property>
5a644f9
-		      <property name="xpad">0</property>
5a644f9
-		      <property name="ypad">0</property>
5a644f9
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-		      <property name="width_chars">-1</property>
5a644f9
-		      <property name="single_line_mode">False</property>
5a644f9
-		      <property name="angle">0</property>
5a644f9
-		    </widget>
5a644f9
-		    <packing>
5a644f9
-		      <property name="padding">0</property>
5a644f9
-		      <property name="expand">False</property>
5a644f9
-		      <property name="fill">False</property>
5a644f9
-		    </packing>
5a644f9
-		  </child>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkHBox" id="hbox6">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="homogeneous">False</property>
5a644f9
-		      <property name="spacing">0</property>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkTable" id="table1">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="n_rows">2</property>
5a644f9
-			  <property name="n_columns">2</property>
5a644f9
-			  <property name="homogeneous">False</property>
5a644f9
-			  <property name="row_spacing">6</property>
5a644f9
-			  <property name="column_spacing">6</property>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkScrolledWindow" id="themes_scrolled_window">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="can_focus">True</property>
5a644f9
-			      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
5a644f9
-			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
5a644f9
-			      <property name="shadow_type">GTK_SHADOW_IN</property>
5a644f9
-			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkTreeView" id="savers_treeview">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="headers_visible">False</property>
5a644f9
-				  <property name="rules_hint">False</property>
5a644f9
-				  <property name="reorderable">False</property>
5a644f9
-				  <property name="enable_search">True</property>
5a644f9
-				  <property name="fixed_height_mode">False</property>
5a644f9
-				  <property name="hover_selection">False</property>
5a644f9
-				  <property name="hover_expand">False</property>
5a644f9
-				  <accessibility>
5a644f9
-				    <atkrelation target="savers_treeview" type="label-for"/>
5a644f9
-				  </accessibility>
5a644f9
-				</widget>
5a644f9
-			      </child>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="left_attach">0</property>
5a644f9
-			      <property name="right_attach">1</property>
5a644f9
-			      <property name="top_attach">0</property>
5a644f9
-			      <property name="bottom_attach">1</property>
5a644f9
-			      <property name="x_options">fill</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkDrawingArea" id="preview_area">
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="left_attach">1</property>
5a644f9
-			      <property name="right_attach">2</property>
5a644f9
-			      <property name="top_attach">0</property>
5a644f9
-			      <property name="bottom_attach">2</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkHButtonBox" id="hbuttonbox1">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="layout_style">GTK_BUTTONBOX_START</property>
5a644f9
-			      <property name="spacing">0</property>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkButton" id="preview_button">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_default">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">True</property>
5a644f9
-
5a644f9
-				  <child>
5a644f9
-				    <widget class="GtkAlignment" id="alignment1">
5a644f9
-				      <property name="visible">True</property>
5a644f9
-				      <property name="xalign">0.5</property>
5a644f9
-				      <property name="yalign">0.5</property>
5a644f9
-				      <property name="xscale">0</property>
5a644f9
-				      <property name="yscale">0</property>
5a644f9
-				      <property name="top_padding">0</property>
5a644f9
-				      <property name="bottom_padding">0</property>
5a644f9
-				      <property name="left_padding">0</property>
5a644f9
-				      <property name="right_padding">0</property>
5a644f9
-
5a644f9
-				      <child>
5a644f9
-					<widget class="GtkHBox" id="hbox10">
5a644f9
-					  <property name="visible">True</property>
5a644f9
-					  <property name="homogeneous">False</property>
5a644f9
-					  <property name="spacing">2</property>
5a644f9
-
5a644f9
-					  <child>
5a644f9
-					    <widget class="GtkImage" id="image3">
5a644f9
-					      <property name="visible">True</property>
5a644f9
-					      <property name="stock">gtk-fullscreen</property>
5a644f9
-					      <property name="icon_size">4</property>
5a644f9
-					      <property name="xalign">0.5</property>
5a644f9
-					      <property name="yalign">0.5</property>
5a644f9
-					      <property name="xpad">0</property>
5a644f9
-					      <property name="ypad">0</property>
5a644f9
-					    </widget>
5a644f9
-					    <packing>
5a644f9
-					      <property name="padding">0</property>
5a644f9
-					      <property name="expand">False</property>
5a644f9
-					      <property name="fill">False</property>
5a644f9
-					    </packing>
5a644f9
-					  </child>
5a644f9
-
5a644f9
-					  <child>
5a644f9
-					    <widget class="GtkLabel" id="preview_button_label">
5a644f9
-					      <property name="visible">True</property>
5a644f9
-					      <property name="label" translatable="yes">_Preview</property>
5a644f9
-					      <property name="use_underline">True</property>
5a644f9
-					      <property name="use_markup">False</property>
5a644f9
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-					      <property name="wrap">False</property>
5a644f9
-					      <property name="selectable">False</property>
5a644f9
-					      <property name="xalign">0.5</property>
5a644f9
-					      <property name="yalign">0.5</property>
5a644f9
-					      <property name="xpad">0</property>
5a644f9
-					      <property name="ypad">0</property>
5a644f9
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-					      <property name="width_chars">-1</property>
5a644f9
-					      <property name="single_line_mode">False</property>
5a644f9
-					      <property name="angle">0</property>
5a644f9
-					    </widget>
5a644f9
-					    <packing>
5a644f9
-					      <property name="padding">0</property>
5a644f9
-					      <property name="expand">False</property>
5a644f9
-					      <property name="fill">False</property>
5a644f9
-					    </packing>
5a644f9
-					  </child>
5a644f9
-					</widget>
5a644f9
-				      </child>
5a644f9
-				    </widget>
5a644f9
-				  </child>
5a644f9
-				</widget>
5a644f9
-			      </child>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="left_attach">0</property>
5a644f9
-			      <property name="right_attach">1</property>
5a644f9
-			      <property name="top_attach">1</property>
5a644f9
-			      <property name="bottom_attach">2</property>
5a644f9
-			      <property name="x_options">fill</property>
5a644f9
-			      <property name="y_options">fill</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-			</widget>
5a644f9
-			<packing>
5a644f9
-			  <property name="padding">0</property>
5a644f9
-			  <property name="expand">True</property>
5a644f9
-			  <property name="fill">True</property>
5a644f9
-			</packing>
5a644f9
-		      </child>
5a644f9
-		    </widget>
5a644f9
-		    <packing>
5a644f9
-		      <property name="padding">0</property>
5a644f9
-		      <property name="expand">True</property>
5a644f9
-		      <property name="fill">True</property>
5a644f9
-		    </packing>
5a644f9
-		  </child>
5a644f9
-		</widget>
5a644f9
-		<packing>
5a644f9
-		  <property name="padding">0</property>
5a644f9
-		  <property name="expand">True</property>
5a644f9
-		  <property name="fill">True</property>
5a644f9
-		</packing>
5a644f9
-	      </child>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">True</property>
5a644f9
-	      <property name="fill">True</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkHBox" id="hbox4">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="homogeneous">False</property>
5a644f9
-	      <property name="spacing">0</property>
5a644f9
-
5a644f9
-	      <child>
5a644f9
-		<widget class="GtkVBox" id="vbox5">
5a644f9
-		  <property name="visible">True</property>
5a644f9
-		  <property name="homogeneous">False</property>
5a644f9
-		  <property name="spacing">0</property>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkHBox" id="hbox4">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="homogeneous">False</property>
5a644f9
-		      <property name="spacing">0</property>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkVBox" id="vbox6">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="homogeneous">False</property>
5a644f9
-			  <property name="spacing">0</property>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkVBox" id="vbox3">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="homogeneous">False</property>
5a644f9
-			      <property name="spacing">6</property>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkHBox" id="activate_delay_hbox">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="homogeneous">False</property>
5a644f9
-				  <property name="spacing">12</property>
5a644f9
-
5a644f9
-				  <child>
5a644f9
-				    <widget class="GtkLabel" id="activate_delay_label">
5a644f9
-				      <property name="visible">True</property>
5a644f9
-				      <property name="label" translatable="yes">Regard the computer as _idle after:</property>
5a644f9
-				      <property name="use_underline">True</property>
5a644f9
-				      <property name="use_markup">False</property>
5a644f9
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-				      <property name="wrap">False</property>
5a644f9
-				      <property name="selectable">False</property>
5a644f9
-				      <property name="xalign">0.5</property>
5a644f9
-				      <property name="yalign">0.5</property>
5a644f9
-				      <property name="xpad">0</property>
5a644f9
-				      <property name="ypad">0</property>
5a644f9
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-				      <property name="width_chars">-1</property>
5a644f9
-				      <property name="single_line_mode">False</property>
5a644f9
-				      <property name="angle">0</property>
5a644f9
-				    </widget>
5a644f9
-				    <packing>
5a644f9
-				      <property name="padding">0</property>
5a644f9
-				      <property name="expand">False</property>
5a644f9
-				      <property name="fill">False</property>
5a644f9
-				    </packing>
5a644f9
-				  </child>
5a644f9
-
5a644f9
-				  <child>
5a644f9
-				    <widget class="GtkHBox" id="hbox4">
5a644f9
-				      <property name="visible">True</property>
5a644f9
-				      <property name="homogeneous">False</property>
5a644f9
-				      <property name="spacing">6</property>
5a644f9
-
5a644f9
-				      <child>
5a644f9
-					<widget class="GtkHScale" id="activate_delay_hscale">
5a644f9
-					  <property name="visible">True</property>
5a644f9
-					  <property name="can_focus">True</property>
5a644f9
-					  <property name="draw_value">True</property>
5a644f9
-					  <property name="value_pos">GTK_POS_TOP</property>
5a644f9
-					  <property name="digits">0</property>
5a644f9
-					  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
5a644f9
-					  <property name="inverted">False</property>
5a644f9
-					  <property name="adjustment">10 1 120 1 10 0</property>
5a644f9
-					</widget>
5a644f9
-					<packing>
5a644f9
-					  <property name="padding">0</property>
5a644f9
-					  <property name="expand">True</property>
5a644f9
-					  <property name="fill">True</property>
5a644f9
-					</packing>
5a644f9
-				      </child>
5a644f9
-				    </widget>
5a644f9
-				    <packing>
5a644f9
-				      <property name="padding">0</property>
5a644f9
-				      <property name="expand">True</property>
5a644f9
-				      <property name="fill">True</property>
5a644f9
-				    </packing>
5a644f9
-				  </child>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">False</property>
5a644f9
-				  <property name="fill">True</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkCheckButton" id="enable_checkbox">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="label" translatable="yes">_Activate screensaver when computer is idle</property>
5a644f9
-				  <property name="use_underline">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">True</property>
5a644f9
-				  <property name="active">False</property>
5a644f9
-				  <property name="inconsistent">False</property>
5a644f9
-				  <property name="draw_indicator">True</property>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">False</property>
5a644f9
-				  <property name="fill">False</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkCheckButton" id="lock_checkbox">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="label" translatable="yes">_Lock screen when screensaver is active</property>
5a644f9
-				  <property name="use_underline">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">True</property>
5a644f9
-				  <property name="active">False</property>
5a644f9
-				  <property name="inconsistent">False</property>
5a644f9
-				  <property name="draw_indicator">True</property>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">False</property>
5a644f9
-				  <property name="fill">False</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkLabel" id="root_warning_label">
5a644f9
-				  <property name="label" translatable="yes"><b>Warning: the screen will not be locked for the root user.</b></property>
5a644f9
-				  <property name="use_underline">False</property>
5a644f9
-				  <property name="use_markup">True</property>
5a644f9
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-				  <property name="wrap">True</property>
5a644f9
-				  <property name="selectable">False</property>
5a644f9
-				  <property name="xalign">0</property>
5a644f9
-				  <property name="yalign">0.5</property>
5a644f9
-				  <property name="xpad">0</property>
5a644f9
-				  <property name="ypad">0</property>
5a644f9
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-				  <property name="width_chars">-1</property>
5a644f9
-				  <property name="single_line_mode">False</property>
5a644f9
-				  <property name="angle">0</property>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">False</property>
5a644f9
-				  <property name="fill">False</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="padding">0</property>
5a644f9
-			      <property name="expand">True</property>
5a644f9
-			      <property name="fill">True</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-			</widget>
5a644f9
-			<packing>
5a644f9
-			  <property name="padding">0</property>
5a644f9
-			  <property name="expand">True</property>
5a644f9
-			  <property name="fill">True</property>
5a644f9
-			</packing>
5a644f9
-		      </child>
5a644f9
-		    </widget>
5a644f9
-		    <packing>
5a644f9
-		      <property name="padding">0</property>
5a644f9
-		      <property name="expand">True</property>
5a644f9
-		      <property name="fill">True</property>
5a644f9
-		    </packing>
5a644f9
-		  </child>
5a644f9
-		</widget>
5a644f9
-		<packing>
5a644f9
-		  <property name="padding">0</property>
5a644f9
-		  <property name="expand">True</property>
5a644f9
-		  <property name="fill">True</property>
5a644f9
-		</packing>
5a644f9
-	      </child>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">False</property>
5a644f9
-	      <property name="fill">True</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-	</widget>
5a644f9
-	<packing>
5a644f9
-	  <property name="padding">0</property>
5a644f9
-	  <property name="expand">True</property>
5a644f9
-	  <property name="fill">True</property>
5a644f9
-	</packing>
5a644f9
-      </child>
5a644f9
-    </widget>
5a644f9
-  </child>
5a644f9
-</widget>
5a644f9
-
5a644f9
-<widget class="GtkWindow" id="fullscreen_preview_window">
5a644f9
-  <property name="can_focus">True</property>
5a644f9
-  <property name="has_focus">True</property>
5a644f9
-  <property name="title" translatable="yes">Screensaver Preview</property>
5a644f9
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
5a644f9
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
5a644f9
-  <property name="modal">True</property>
5a644f9
-  <property name="resizable">True</property>
5a644f9
-  <property name="destroy_with_parent">True</property>
5a644f9
-  <property name="decorated">False</property>
5a644f9
-  <property name="skip_taskbar_hint">True</property>
5a644f9
-  <property name="skip_pager_hint">True</property>
5a644f9
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
5a644f9
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5a644f9
-  <property name="focus_on_map">True</property>
5a644f9
-  <property name="urgency_hint">False</property>
5a644f9
-
5a644f9
-  <child>
5a644f9
-    <widget class="GtkVBox" id="vbox10">
5a644f9
-      <property name="visible">True</property>
5a644f9
-      <property name="homogeneous">False</property>
5a644f9
-      <property name="spacing">0</property>
5a644f9
-
5a644f9
-      <child>
5a644f9
-	<widget class="GtkHBox" id="hbox9">
5a644f9
-	  <property name="visible">True</property>
5a644f9
-	  <property name="homogeneous">False</property>
5a644f9
-	  <property name="spacing">0</property>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkImage" id="image2">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="stock">gtk-dialog-warning</property>
5a644f9
-	      <property name="icon_size">4</property>
5a644f9
-	      <property name="xalign">0.5</property>
5a644f9
-	      <property name="yalign">0.5</property>
5a644f9
-	      <property name="xpad">10</property>
5a644f9
-	      <property name="ypad">0</property>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">False</property>
5a644f9
-	      <property name="fill">False</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkLabel" id="label15">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="label" translatable="yes"><b>Screensaver preview</b></property>
5a644f9
-	      <property name="use_underline">False</property>
5a644f9
-	      <property name="use_markup">True</property>
5a644f9
-	      <property name="justify">GTK_JUSTIFY_FILL</property>
5a644f9
-	      <property name="wrap">True</property>
5a644f9
-	      <property name="selectable">False</property>
5a644f9
-	      <property name="xalign">0</property>
5a644f9
-	      <property name="yalign">0.5</property>
5a644f9
-	      <property name="xpad">0</property>
5a644f9
-	      <property name="ypad">0</property>
5a644f9
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-	      <property name="width_chars">-1</property>
5a644f9
-	      <property name="single_line_mode">False</property>
5a644f9
-	      <property name="angle">0</property>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">False</property>
5a644f9
-	      <property name="fill">True</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkLabel" id="fullscreen_preview_theme_label">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="label" translatable="yes"></property>
5a644f9
-	      <property name="use_underline">False</property>
5a644f9
-	      <property name="use_markup">False</property>
5a644f9
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-	      <property name="wrap">False</property>
5a644f9
-	      <property name="selectable">False</property>
5a644f9
-	      <property name="xalign">0.5</property>
5a644f9
-	      <property name="yalign">0.5</property>
5a644f9
-	      <property name="xpad">0</property>
5a644f9
-	      <property name="ypad">0</property>
5a644f9
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-	      <property name="width_chars">-1</property>
5a644f9
-	      <property name="single_line_mode">False</property>
5a644f9
-	      <property name="angle">0</property>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">True</property>
5a644f9
-	      <property name="fill">True</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkButton" id="fullscreen_preview_previous_button">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="can_focus">True</property>
5a644f9
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-	      <property name="focus_on_click">True</property>
5a644f9
-
5a644f9
-	      <child>
5a644f9
-		<widget class="GtkImage" id="image5">
5a644f9
-		  <property name="visible">True</property>
5a644f9
-		  <property name="stock">gtk-go-back</property>
5a644f9
-		  <property name="icon_size">4</property>
5a644f9
-		  <property name="xalign">0.5</property>
5a644f9
-		  <property name="yalign">0.5</property>
5a644f9
-		  <property name="xpad">0</property>
5a644f9
-		  <property name="ypad">0</property>
5a644f9
-		</widget>
5a644f9
-	      </child>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">False</property>
5a644f9
-	      <property name="fill">False</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkButton" id="fullscreen_preview_next_button">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="can_focus">True</property>
5a644f9
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-	      <property name="focus_on_click">True</property>
5a644f9
-
5a644f9
-	      <child>
5a644f9
-		<widget class="GtkImage" id="image4">
5a644f9
-		  <property name="visible">True</property>
5a644f9
-		  <property name="stock">gtk-go-forward</property>
5a644f9
-		  <property name="icon_size">4</property>
5a644f9
-		  <property name="xalign">0.5</property>
5a644f9
-		  <property name="yalign">0.5</property>
5a644f9
-		  <property name="xpad">0</property>
5a644f9
-		  <property name="ypad">0</property>
5a644f9
-		</widget>
5a644f9
-	      </child>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">False</property>
5a644f9
-	      <property name="fill">False</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkButton" id="fullscreen_preview_close">
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="can_focus">True</property>
5a644f9
-	      <property name="label">gtk-leave-fullscreen</property>
5a644f9
-	      <property name="use_stock">True</property>
5a644f9
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-	      <property name="focus_on_click">True</property>
5a644f9
-	    </widget>
5a644f9
-	    <packing>
5a644f9
-	      <property name="padding">0</property>
5a644f9
-	      <property name="expand">False</property>
5a644f9
-	      <property name="fill">False</property>
5a644f9
-	    </packing>
5a644f9
-	  </child>
5a644f9
-	</widget>
5a644f9
-	<packing>
5a644f9
-	  <property name="padding">0</property>
5a644f9
-	  <property name="expand">False</property>
5a644f9
-	  <property name="fill">False</property>
5a644f9
-	</packing>
5a644f9
-      </child>
5a644f9
-
5a644f9
-      <child>
5a644f9
-	<widget class="GtkDrawingArea" id="fullscreen_preview_area">
5a644f9
-	  <property name="visible">True</property>
5a644f9
-	</widget>
5a644f9
-	<packing>
5a644f9
-	  <property name="padding">0</property>
5a644f9
-	  <property name="expand">True</property>
5a644f9
-	  <property name="fill">True</property>
5a644f9
-	</packing>
5a644f9
-      </child>
5a644f9
-    </widget>
5a644f9
-  </child>
5a644f9
-</widget>
5a644f9
-
5a644f9
-</glade-interface>
5a644f9
diff --git a/data/gnome-screensaver-preferences.ui b/data/gnome-screensaver-preferences.ui
5a644f9
new file mode 100644
5a644f9
index 0000000..6b88f37
5a644f9
--- /dev/null
5a644f9
+++ b/data/gnome-screensaver-preferences.ui
5a644f9
@@ -0,0 +1,719 @@
5a644f9
+
5a644f9
+
5a644f9
+<interface>
5a644f9
+  <object class="GtkAdjustment" id="adjustment1">
5a644f9
+    <property name="upper">120</property>
5a644f9
+    <property name="lower">1</property>
5a644f9
+    <property name="page_increment">10</property>
5a644f9
+    <property name="step_increment">1</property>
5a644f9
+    <property name="page_size">0</property>
5a644f9
+    <property name="value">10</property>
5a644f9
+  </object>
5a644f9
+  <object class="GtkDialog" id="prefs_dialog">
5a644f9
+    <property name="border_width">5</property>
5a644f9
+    <property name="visible">True</property>
5a644f9
+    <property name="title" translatable="yes">Screensaver Preferences</property>
5a644f9
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
5a644f9
+    <property name="window_position">GTK_WIN_POS_NONE</property>
5a644f9
+    <property name="modal">False</property>
5a644f9
+    <property name="default_width">600</property>
5a644f9
+    <property name="default_height">400</property>
5a644f9
+    <property name="resizable">True</property>
5a644f9
+    <property name="destroy_with_parent">False</property>
5a644f9
+    <property name="decorated">True</property>
5a644f9
+    <property name="skip_taskbar_hint">False</property>
5a644f9
+    <property name="skip_pager_hint">False</property>
5a644f9
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
5a644f9
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5a644f9
+    <property name="focus_on_map">True</property>
5a644f9
+    <property name="urgency_hint">False</property>
5a644f9
+    <property name="has_separator">False</property>
5a644f9
+    <child internal-child="vbox">
5a644f9
+      <object class="GtkVBox" id="dialog-vbox1">
5a644f9
+        <property name="visible">True</property>
5a644f9
+        <property name="homogeneous">False</property>
5a644f9
+        <property name="spacing">2</property>
5a644f9
+        <child internal-child="action_area">
5a644f9
+          <object class="GtkHButtonBox" id="dialog-action_area1">
5a644f9
+            <property name="visible">True</property>
5a644f9
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
5a644f9
+            <child>
5a644f9
+              <object class="GtkButton" id="helpbutton1">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="can_default">True</property>
5a644f9
+                <property name="can_focus">True</property>
5a644f9
+                <property name="label">gtk-help</property>
5a644f9
+                <property name="use_stock">True</property>
5a644f9
+                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                <property name="focus_on_click">True</property>
5a644f9
+              </object>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkButton" id="gpm_button">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="can_default">True</property>
5a644f9
+                <property name="can_focus">True</property>
5a644f9
+                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                <property name="focus_on_click">True</property>
5a644f9
+                <child>
5a644f9
+                  <object class="GtkAlignment" id="alignment2">
5a644f9
+                    <property name="visible">True</property>
5a644f9
+                    <property name="xalign">0.5</property>
5a644f9
+                    <property name="yalign">0.5</property>
5a644f9
+                    <property name="xscale">0</property>
5a644f9
+                    <property name="yscale">0</property>
5a644f9
+                    <property name="top_padding">0</property>
5a644f9
+                    <property name="bottom_padding">0</property>
5a644f9
+                    <property name="left_padding">0</property>
5a644f9
+                    <property name="right_padding">0</property>
5a644f9
+                    <child>
5a644f9
+                      <object class="GtkHBox" id="hbox11">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="homogeneous">False</property>
5a644f9
+                        <property name="spacing">2</property>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkImage" id="image6">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="stock">gtk-jump-to</property>
5a644f9
+                            <property name="icon_size">4</property>
5a644f9
+                            <property name="xalign">0.5</property>
5a644f9
+                            <property name="yalign">0.5</property>
5a644f9
+                            <property name="xpad">0</property>
5a644f9
+                            <property name="ypad">0</property>
5a644f9
+                          </object>
5a644f9
+                          <packing>
5a644f9
+                            <property name="padding">0</property>
5a644f9
+                            <property name="expand">False</property>
5a644f9
+                            <property name="fill">False</property>
5a644f9
+                          </packing>
5a644f9
+                        </child>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkLabel" id="label16">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="label" translatable="yes">Power _Management</property>
5a644f9
+                            <property name="use_underline">True</property>
5a644f9
+                            <property name="use_markup">False</property>
5a644f9
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                            <property name="wrap">False</property>
5a644f9
+                            <property name="selectable">False</property>
5a644f9
+                            <property name="xalign">0.5</property>
5a644f9
+                            <property name="yalign">0.5</property>
5a644f9
+                            <property name="xpad">0</property>
5a644f9
+                            <property name="ypad">0</property>
5a644f9
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                            <property name="width_chars">-1</property>
5a644f9
+                            <property name="single_line_mode">False</property>
5a644f9
+                            <property name="angle">0</property>
5a644f9
+                          </object>
5a644f9
+                          <packing>
5a644f9
+                            <property name="padding">0</property>
5a644f9
+                            <property name="expand">False</property>
5a644f9
+                            <property name="fill">False</property>
5a644f9
+                          </packing>
5a644f9
+                        </child>
5a644f9
+                      </object>
5a644f9
+                    </child>
5a644f9
+                  </object>
5a644f9
+                </child>
5a644f9
+              </object>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkButton" id="button1">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="can_default">True</property>
5a644f9
+                <property name="can_focus">True</property>
5a644f9
+                <property name="label">gtk-close</property>
5a644f9
+                <property name="use_stock">True</property>
5a644f9
+                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                <property name="focus_on_click">True</property>
5a644f9
+              </object>
5a644f9
+            </child>
5a644f9
+          </object>
5a644f9
+          <packing>
5a644f9
+            <property name="padding">0</property>
5a644f9
+            <property name="expand">False</property>
5a644f9
+            <property name="fill">True</property>
5a644f9
+            <property name="pack_type">GTK_PACK_END</property>
5a644f9
+          </packing>
5a644f9
+        </child>
5a644f9
+        <child>
5a644f9
+          <object class="GtkVBox" id="vbox1">
5a644f9
+            <property name="border_width">5</property>
5a644f9
+            <property name="visible">True</property>
5a644f9
+            <property name="homogeneous">False</property>
5a644f9
+            <property name="spacing">12</property>
5a644f9
+            <child>
5a644f9
+              <object class="GtkHBox" id="hbox1">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="homogeneous">False</property>
5a644f9
+                <property name="spacing">12</property>
5a644f9
+                <child>
5a644f9
+                  <object class="GtkVBox" id="vbox8">
5a644f9
+                    <property name="visible">True</property>
5a644f9
+                    <property name="homogeneous">False</property>
5a644f9
+                    <property name="spacing">6</property>
5a644f9
+                    <child>
5a644f9
+                      <object class="GtkLabel" id="savers_label">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="label" translatable="yes">_Screensaver theme:</property>
5a644f9
+                        <property name="use_underline">True</property>
5a644f9
+                        <property name="use_markup">True</property>
5a644f9
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                        <property name="wrap">False</property>
5a644f9
+                        <property name="selectable">False</property>
5a644f9
+                        <property name="xalign">0</property>
5a644f9
+                        <property name="yalign">0.5</property>
5a644f9
+                        <property name="xpad">0</property>
5a644f9
+                        <property name="ypad">0</property>
5a644f9
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                        <property name="width_chars">-1</property>
5a644f9
+                        <property name="single_line_mode">False</property>
5a644f9
+                        <property name="angle">0</property>
5a644f9
+                      </object>
5a644f9
+                      <packing>
5a644f9
+                        <property name="padding">0</property>
5a644f9
+                        <property name="expand">False</property>
5a644f9
+                        <property name="fill">False</property>
5a644f9
+                      </packing>
5a644f9
+                    </child>
5a644f9
+                    <child>
5a644f9
+                      <object class="GtkHBox" id="hbox6">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="homogeneous">False</property>
5a644f9
+                        <property name="spacing">0</property>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkTable" id="table1">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="n_rows">2</property>
5a644f9
+                            <property name="n_columns">2</property>
5a644f9
+                            <property name="homogeneous">False</property>
5a644f9
+                            <property name="row_spacing">6</property>
5a644f9
+                            <property name="column_spacing">6</property>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkScrolledWindow" id="themes_scrolled_window">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="can_focus">True</property>
5a644f9
+                                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
5a644f9
+                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
5a644f9
+                                <property name="shadow_type">GTK_SHADOW_IN</property>
5a644f9
+                                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkTreeView" id="savers_treeview">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="headers_visible">False</property>
5a644f9
+                                    <property name="rules_hint">False</property>
5a644f9
+                                    <property name="reorderable">False</property>
5a644f9
+                                    <property name="enable_search">True</property>
5a644f9
+                                    <property name="fixed_height_mode">False</property>
5a644f9
+                                    <property name="hover_selection">False</property>
5a644f9
+                                    <property name="hover_expand">False</property>
5a644f9
+                                    <accessibility>
5a644f9
+                                      <relation target="savers_treeview" type="label-for"/>
5a644f9
+                                    </accessibility>
5a644f9
+                                  </object>
5a644f9
+                                </child>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="left_attach">0</property>
5a644f9
+                                <property name="right_attach">1</property>
5a644f9
+                                <property name="top_attach">0</property>
5a644f9
+                                <property name="bottom_attach">1</property>
5a644f9
+                                <property name="x_options">fill</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkDrawingArea" id="preview_area">
5a644f9
+			    </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="left_attach">1</property>
5a644f9
+                                <property name="right_attach">2</property>
5a644f9
+                                <property name="top_attach">0</property>
5a644f9
+                                <property name="bottom_attach">2</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkHButtonBox" id="hbuttonbox1">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="layout_style">GTK_BUTTONBOX_START</property>
5a644f9
+                                <property name="spacing">0</property>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkButton" id="preview_button">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_default">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">True</property>
5a644f9
+                                    <child>
5a644f9
+                                      <object class="GtkAlignment" id="alignment1">
5a644f9
+                                        <property name="visible">True</property>
5a644f9
+                                        <property name="xalign">0.5</property>
5a644f9
+                                        <property name="yalign">0.5</property>
5a644f9
+                                        <property name="xscale">0</property>
5a644f9
+                                        <property name="yscale">0</property>
5a644f9
+                                        <property name="top_padding">0</property>
5a644f9
+                                        <property name="bottom_padding">0</property>
5a644f9
+                                        <property name="left_padding">0</property>
5a644f9
+                                        <property name="right_padding">0</property>
5a644f9
+                                        <child>
5a644f9
+                                          <object class="GtkHBox" id="hbox10">
5a644f9
+                                            <property name="visible">True</property>
5a644f9
+                                            <property name="homogeneous">False</property>
5a644f9
+                                            <property name="spacing">2</property>
5a644f9
+                                            <child>
5a644f9
+                                              <object class="GtkImage" id="image3">
5a644f9
+                                                <property name="visible">True</property>
5a644f9
+                                                <property name="stock">gtk-fullscreen</property>
5a644f9
+                                                <property name="icon_size">4</property>
5a644f9
+                                                <property name="xalign">0.5</property>
5a644f9
+                                                <property name="yalign">0.5</property>
5a644f9
+                                                <property name="xpad">0</property>
5a644f9
+                                                <property name="ypad">0</property>
5a644f9
+                                              </object>
5a644f9
+                                              <packing>
5a644f9
+                                                <property name="padding">0</property>
5a644f9
+                                                <property name="expand">False</property>
5a644f9
+                                                <property name="fill">False</property>
5a644f9
+                                              </packing>
5a644f9
+                                            </child>
5a644f9
+                                            <child>
5a644f9
+                                              <object class="GtkLabel" id="preview_button_label">
5a644f9
+                                                <property name="visible">True</property>
5a644f9
+                                                <property name="label" translatable="yes">_Preview</property>
5a644f9
+                                                <property name="use_underline">True</property>
5a644f9
+                                                <property name="use_markup">False</property>
5a644f9
+                                                <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                                <property name="wrap">False</property>
5a644f9
+                                                <property name="selectable">False</property>
5a644f9
+                                                <property name="xalign">0.5</property>
5a644f9
+                                                <property name="yalign">0.5</property>
5a644f9
+                                                <property name="xpad">0</property>
5a644f9
+                                                <property name="ypad">0</property>
5a644f9
+                                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                                <property name="width_chars">-1</property>
5a644f9
+                                                <property name="single_line_mode">False</property>
5a644f9
+                                                <property name="angle">0</property>
5a644f9
+                                              </object>
5a644f9
+                                              <packing>
5a644f9
+                                                <property name="padding">0</property>
5a644f9
+                                                <property name="expand">False</property>
5a644f9
+                                                <property name="fill">False</property>
5a644f9
+                                              </packing>
5a644f9
+                                            </child>
5a644f9
+                                          </object>
5a644f9
+                                        </child>
5a644f9
+                                      </object>
5a644f9
+                                    </child>
5a644f9
+                                  </object>
5a644f9
+                                </child>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="left_attach">0</property>
5a644f9
+                                <property name="right_attach">1</property>
5a644f9
+                                <property name="top_attach">1</property>
5a644f9
+                                <property name="bottom_attach">2</property>
5a644f9
+                                <property name="x_options">fill</property>
5a644f9
+                                <property name="y_options">fill</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                          </object>
5a644f9
+                          <packing>
5a644f9
+                            <property name="padding">0</property>
5a644f9
+                            <property name="expand">True</property>
5a644f9
+                            <property name="fill">True</property>
5a644f9
+                          </packing>
5a644f9
+                        </child>
5a644f9
+                      </object>
5a644f9
+                      <packing>
5a644f9
+                        <property name="padding">0</property>
5a644f9
+                        <property name="expand">True</property>
5a644f9
+                        <property name="fill">True</property>
5a644f9
+                      </packing>
5a644f9
+                    </child>
5a644f9
+                  </object>
5a644f9
+                  <packing>
5a644f9
+                    <property name="padding">0</property>
5a644f9
+                    <property name="expand">True</property>
5a644f9
+                    <property name="fill">True</property>
5a644f9
+                  </packing>
5a644f9
+                </child>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">True</property>
5a644f9
+                <property name="fill">True</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkHBox" id="hbox2">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="homogeneous">False</property>
5a644f9
+                <property name="spacing">0</property>
5a644f9
+                <child>
5a644f9
+                  <object class="GtkVBox" id="vbox5">
5a644f9
+                    <property name="visible">True</property>
5a644f9
+                    <property name="homogeneous">False</property>
5a644f9
+                    <property name="spacing">0</property>
5a644f9
+                    <child>
5a644f9
+                      <object class="GtkHBox" id="hbox3">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="homogeneous">False</property>
5a644f9
+                        <property name="spacing">0</property>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkVBox" id="vbox6">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="homogeneous">False</property>
5a644f9
+                            <property name="spacing">0</property>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkVBox" id="vbox3">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="homogeneous">False</property>
5a644f9
+                                <property name="spacing">6</property>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkHBox" id="activate_delay_hbox">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="homogeneous">False</property>
5a644f9
+                                    <property name="spacing">12</property>
5a644f9
+                                    <child>
5a644f9
+                                      <object class="GtkLabel" id="activate_delay_label">
5a644f9
+                                        <property name="visible">True</property>
5a644f9
+                                        <property name="label" translatable="yes">Regard the computer as _idle after:</property>
5a644f9
+                                        <property name="use_underline">True</property>
5a644f9
+                                        <property name="use_markup">False</property>
5a644f9
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                        <property name="wrap">False</property>
5a644f9
+                                        <property name="selectable">False</property>
5a644f9
+                                        <property name="xalign">0.5</property>
5a644f9
+                                        <property name="yalign">0.5</property>
5a644f9
+                                        <property name="xpad">0</property>
5a644f9
+                                        <property name="ypad">0</property>
5a644f9
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                        <property name="width_chars">-1</property>
5a644f9
+                                        <property name="single_line_mode">False</property>
5a644f9
+                                        <property name="angle">0</property>
5a644f9
+                                      </object>
5a644f9
+                                      <packing>
5a644f9
+                                        <property name="padding">0</property>
5a644f9
+                                        <property name="expand">False</property>
5a644f9
+                                        <property name="fill">False</property>
5a644f9
+                                      </packing>
5a644f9
+                                    </child>
5a644f9
+                                    <child>
5a644f9
+                                      <object class="GtkHBox" id="hbox4">
5a644f9
+                                        <property name="visible">True</property>
5a644f9
+                                        <property name="homogeneous">False</property>
5a644f9
+                                        <property name="spacing">6</property>
5a644f9
+                                        <child>
5a644f9
+                                          <object class="GtkHScale" id="activate_delay_hscale">
5a644f9
+                                            <property name="visible">True</property>
5a644f9
+                                            <property name="can_focus">True</property>
5a644f9
+                                            <property name="draw_value">True</property>
5a644f9
+                                            <property name="value_pos">GTK_POS_TOP</property>
5a644f9
+                                            <property name="digits">0</property>
5a644f9
+                                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
5a644f9
+                                            <property name="inverted">False</property>
5a644f9
+                                            <property name="adjustment">adjustment1</property>
5a644f9
+                                          </object>
5a644f9
+                                          <packing>
5a644f9
+                                            <property name="padding">0</property>
5a644f9
+                                            <property name="expand">True</property>
5a644f9
+                                            <property name="fill">True</property>
5a644f9
+                                          </packing>
5a644f9
+                                        </child>
5a644f9
+                                      </object>
5a644f9
+                                      <packing>
5a644f9
+                                        <property name="padding">0</property>
5a644f9
+                                        <property name="expand">True</property>
5a644f9
+                                        <property name="fill">True</property>
5a644f9
+                                      </packing>
5a644f9
+                                    </child>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">False</property>
5a644f9
+                                    <property name="fill">True</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkCheckButton" id="enable_checkbox">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="label" translatable="yes">_Activate screensaver when computer is idle</property>
5a644f9
+                                    <property name="use_underline">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">True</property>
5a644f9
+                                    <property name="active">False</property>
5a644f9
+                                    <property name="inconsistent">False</property>
5a644f9
+                                    <property name="draw_indicator">True</property>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">False</property>
5a644f9
+                                    <property name="fill">False</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkCheckButton" id="lock_checkbox">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="label" translatable="yes">_Lock screen when screensaver is active</property>
5a644f9
+                                    <property name="use_underline">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">True</property>
5a644f9
+                                    <property name="active">False</property>
5a644f9
+                                    <property name="inconsistent">False</property>
5a644f9
+                                    <property name="draw_indicator">True</property>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">False</property>
5a644f9
+                                    <property name="fill">False</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkLabel" id="root_warning_label">
5a644f9
+                                    <property name="label" translatable="yes"><b>Warning: the screen will not be locked for the root user.</b></property>
5a644f9
+                                    <property name="use_underline">False</property>
5a644f9
+                                    <property name="use_markup">True</property>
5a644f9
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                    <property name="wrap">True</property>
5a644f9
+                                    <property name="selectable">False</property>
5a644f9
+                                    <property name="xalign">0</property>
5a644f9
+                                    <property name="yalign">0.5</property>
5a644f9
+                                    <property name="xpad">0</property>
5a644f9
+                                    <property name="ypad">0</property>
5a644f9
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                    <property name="width_chars">-1</property>
5a644f9
+                                    <property name="single_line_mode">False</property>
5a644f9
+                                    <property name="angle">0</property>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">False</property>
5a644f9
+                                    <property name="fill">False</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="padding">0</property>
5a644f9
+                                <property name="expand">True</property>
5a644f9
+                                <property name="fill">True</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                          </object>
5a644f9
+                          <packing>
5a644f9
+                            <property name="padding">0</property>
5a644f9
+                            <property name="expand">True</property>
5a644f9
+                            <property name="fill">True</property>
5a644f9
+                          </packing>
5a644f9
+                        </child>
5a644f9
+                      </object>
5a644f9
+                      <packing>
5a644f9
+                        <property name="padding">0</property>
5a644f9
+                        <property name="expand">True</property>
5a644f9
+                        <property name="fill">True</property>
5a644f9
+                      </packing>
5a644f9
+                    </child>
5a644f9
+                  </object>
5a644f9
+                  <packing>
5a644f9
+                    <property name="padding">0</property>
5a644f9
+                    <property name="expand">True</property>
5a644f9
+                    <property name="fill">True</property>
5a644f9
+                  </packing>
5a644f9
+                </child>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">False</property>
5a644f9
+                <property name="fill">True</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+          </object>
5a644f9
+          <packing>
5a644f9
+            <property name="padding">0</property>
5a644f9
+            <property name="expand">True</property>
5a644f9
+            <property name="fill">True</property>
5a644f9
+          </packing>
5a644f9
+        </child>
5a644f9
+      </object>
5a644f9
+    </child>
5a644f9
+    <action-widgets>
5a644f9
+      <action-widget response="-11">helpbutton1</action-widget>
5a644f9
+      <action-widget response="-2">gpm_button</action-widget>
5a644f9
+      <action-widget response="-7">button1</action-widget>
5a644f9
+    </action-widgets>
5a644f9
+  </object>
5a644f9
+  <object class="GtkWindow" id="fullscreen_preview_window">
5a644f9
+    <property name="can_focus">True</property>
5a644f9
+    <property name="has_focus">True</property>
5a644f9
+    <property name="title" translatable="yes">Screensaver Preview</property>
5a644f9
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
5a644f9
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
5a644f9
+    <property name="modal">True</property>
5a644f9
+    <property name="resizable">True</property>
5a644f9
+    <property name="destroy_with_parent">True</property>
5a644f9
+    <property name="decorated">False</property>
5a644f9
+    <property name="skip_taskbar_hint">True</property>
5a644f9
+    <property name="skip_pager_hint">True</property>
5a644f9
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
5a644f9
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5a644f9
+    <property name="focus_on_map">True</property>
5a644f9
+    <property name="urgency_hint">False</property>
5a644f9
+    <child>
5a644f9
+      <object class="GtkVBox" id="vbox10">
5a644f9
+        <property name="visible">True</property>
5a644f9
+        <property name="homogeneous">False</property>
5a644f9
+        <property name="spacing">0</property>
5a644f9
+        <child>
5a644f9
+          <object class="GtkHBox" id="hbox9">
5a644f9
+            <property name="visible">True</property>
5a644f9
+            <property name="homogeneous">False</property>
5a644f9
+            <property name="spacing">0</property>
5a644f9
+            <child>
5a644f9
+              <object class="GtkImage" id="image2">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="stock">gtk-dialog-warning</property>
5a644f9
+                <property name="icon_size">4</property>
5a644f9
+                <property name="xalign">0.5</property>
5a644f9
+                <property name="yalign">0.5</property>
5a644f9
+                <property name="xpad">10</property>
5a644f9
+                <property name="ypad">0</property>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">False</property>
5a644f9
+                <property name="fill">False</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkLabel" id="label15">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="label" translatable="yes"><b>Screensaver preview</b></property>
5a644f9
+                <property name="use_underline">False</property>
5a644f9
+                <property name="use_markup">True</property>
5a644f9
+                <property name="justify">GTK_JUSTIFY_FILL</property>
5a644f9
+                <property name="wrap">True</property>
5a644f9
+                <property name="selectable">False</property>
5a644f9
+                <property name="xalign">0</property>
5a644f9
+                <property name="yalign">0.5</property>
5a644f9
+                <property name="xpad">0</property>
5a644f9
+                <property name="ypad">0</property>
5a644f9
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                <property name="width_chars">-1</property>
5a644f9
+                <property name="single_line_mode">False</property>
5a644f9
+                <property name="angle">0</property>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">False</property>
5a644f9
+                <property name="fill">True</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkLabel" id="fullscreen_preview_theme_label">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="label" translatable="yes"/>
5a644f9
+                <property name="use_underline">False</property>
5a644f9
+                <property name="use_markup">False</property>
5a644f9
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                <property name="wrap">False</property>
5a644f9
+                <property name="selectable">False</property>
5a644f9
+                <property name="xalign">0.5</property>
5a644f9
+                <property name="yalign">0.5</property>
5a644f9
+                <property name="xpad">0</property>
5a644f9
+                <property name="ypad">0</property>
5a644f9
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                <property name="width_chars">-1</property>
5a644f9
+                <property name="single_line_mode">False</property>
5a644f9
+                <property name="angle">0</property>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">True</property>
5a644f9
+                <property name="fill">True</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkButton" id="fullscreen_preview_previous_button">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="can_focus">True</property>
5a644f9
+                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                <property name="focus_on_click">True</property>
5a644f9
+                <child>
5a644f9
+                  <object class="GtkImage" id="image5">
5a644f9
+                    <property name="visible">True</property>
5a644f9
+                    <property name="stock">gtk-go-back</property>
5a644f9
+                    <property name="icon_size">4</property>
5a644f9
+                    <property name="xalign">0.5</property>
5a644f9
+                    <property name="yalign">0.5</property>
5a644f9
+                    <property name="xpad">0</property>
5a644f9
+                    <property name="ypad">0</property>
5a644f9
+                  </object>
5a644f9
+                </child>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">False</property>
5a644f9
+                <property name="fill">False</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkButton" id="fullscreen_preview_next_button">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="can_focus">True</property>
5a644f9
+                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                <property name="focus_on_click">True</property>
5a644f9
+                <child>
5a644f9
+                  <object class="GtkImage" id="image4">
5a644f9
+                    <property name="visible">True</property>
5a644f9
+                    <property name="stock">gtk-go-forward</property>
5a644f9
+                    <property name="icon_size">4</property>
5a644f9
+                    <property name="xalign">0.5</property>
5a644f9
+                    <property name="yalign">0.5</property>
5a644f9
+                    <property name="xpad">0</property>
5a644f9
+                    <property name="ypad">0</property>
5a644f9
+                  </object>
5a644f9
+                </child>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">False</property>
5a644f9
+                <property name="fill">False</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+            <child>
5a644f9
+              <object class="GtkButton" id="fullscreen_preview_close">
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="can_focus">True</property>
5a644f9
+                <property name="label">gtk-leave-fullscreen</property>
5a644f9
+                <property name="use_stock">True</property>
5a644f9
+                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                <property name="focus_on_click">True</property>
5a644f9
+              </object>
5a644f9
+              <packing>
5a644f9
+                <property name="padding">0</property>
5a644f9
+                <property name="expand">False</property>
5a644f9
+                <property name="fill">False</property>
5a644f9
+              </packing>
5a644f9
+            </child>
5a644f9
+          </object>
5a644f9
+          <packing>
5a644f9
+            <property name="padding">0</property>
5a644f9
+            <property name="expand">False</property>
5a644f9
+            <property name="fill">False</property>
5a644f9
+          </packing>
5a644f9
+        </child>
5a644f9
+        <child>
5a644f9
+          <object class="GtkDrawingArea" id="fullscreen_preview_area">
5a644f9
+            <property name="visible">True</property>
5a644f9
+          </object>
5a644f9
+          <packing>
5a644f9
+            <property name="padding">0</property>
5a644f9
+            <property name="expand">True</property>
5a644f9
+            <property name="fill">True</property>
5a644f9
+          </packing>
5a644f9
+        </child>
5a644f9
+      </object>
5a644f9
+    </child>
5a644f9
+  </object>
5a644f9
+</interface>
5a644f9
diff --git a/data/lock-dialog-default.glade b/data/lock-dialog-default.glade
5a644f9
deleted file mode 100644
5a644f9
index 17f4e21..0000000
5a644f9
--- a/data/lock-dialog-default.glade
5a644f9
+++ /dev/null
5a644f9
@@ -1,568 +0,0 @@
5a644f9
- 
5a644f9
-
5a644f9
-
5a644f9
-<glade-interface>
5a644f9
-
5a644f9
-<widget class="GtkWindow" id="window1">
5a644f9
-  <property name="visible">True</property>
5a644f9
-  <property name="title" translatable="yes">window1</property>
5a644f9
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
5a644f9
-  <property name="window_position">GTK_WIN_POS_NONE</property>
5a644f9
-  <property name="modal">False</property>
5a644f9
-  <property name="resizable">True</property>
5a644f9
-  <property name="destroy_with_parent">False</property>
5a644f9
-  <property name="decorated">True</property>
5a644f9
-  <property name="skip_taskbar_hint">False</property>
5a644f9
-  <property name="skip_pager_hint">False</property>
5a644f9
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
5a644f9
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5a644f9
-  <property name="focus_on_map">True</property>
5a644f9
-  <property name="urgency_hint">False</property>
5a644f9
-
5a644f9
-  <child>
5a644f9
-    <widget class="GtkFrame" id="lock-dialog">
5a644f9
-      <property name="visible">True</property>
5a644f9
-      <property name="label_xalign">0</property>
5a644f9
-      <property name="label_yalign">0.5</property>
5a644f9
-      <property name="shadow_type">GTK_SHADOW_OUT</property>
5a644f9
-
5a644f9
-      <child>
5a644f9
-	<widget class="GtkAlignment" id="alignment1">
5a644f9
-	  <property name="border_width">12</property>
5a644f9
-	  <property name="visible">True</property>
5a644f9
-	  <property name="xalign">0.5</property>
5a644f9
-	  <property name="yalign">0.5</property>
5a644f9
-	  <property name="xscale">1</property>
5a644f9
-	  <property name="yscale">1</property>
5a644f9
-	  <property name="top_padding">0</property>
5a644f9
-	  <property name="bottom_padding">0</property>
5a644f9
-	  <property name="left_padding">0</property>
5a644f9
-	  <property name="right_padding">0</property>
5a644f9
-
5a644f9
-	  <child>
5a644f9
-	    <widget class="GtkVBox" id="lock-box">
5a644f9
-	      <property name="border_width">18</property>
5a644f9
-	      <property name="visible">True</property>
5a644f9
-	      <property name="homogeneous">False</property>
5a644f9
-	      <property name="spacing">0</property>
5a644f9
-
5a644f9
-	      <child>
5a644f9
-		<widget class="GtkNotebook" id="notebook">
5a644f9
-		  <property name="visible">True</property>
5a644f9
-		  <property name="show_tabs">False</property>
5a644f9
-		  <property name="show_border">False</property>
5a644f9
-		  <property name="tab_pos">GTK_POS_TOP</property>
5a644f9
-		  <property name="scrollable">False</property>
5a644f9
-		  <property name="enable_popup">False</property>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkAlignment" id="alignment1">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="xalign">0.5</property>
5a644f9
-		      <property name="yalign">0.5</property>
5a644f9
-		      <property name="xscale">1</property>
5a644f9
-		      <property name="yscale">1</property>
5a644f9
-		      <property name="top_padding">0</property>
5a644f9
-		      <property name="bottom_padding">0</property>
5a644f9
-		      <property name="left_padding">0</property>
5a644f9
-		      <property name="right_padding">0</property>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkVBox" id="vbox2">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="homogeneous">False</property>
5a644f9
-			  <property name="spacing">12</property>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkImage" id="auth-face-image">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="xalign">0.5</property>
5a644f9
-			      <property name="yalign">1</property>
5a644f9
-			      <property name="xpad">0</property>
5a644f9
-			      <property name="ypad">0</property>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="padding">0</property>
5a644f9
-			      <property name="expand">True</property>
5a644f9
-			      <property name="fill">True</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkVBox" id="vbox3">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="homogeneous">False</property>
5a644f9
-			      <property name="spacing">0</property>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkLabel" id="auth-realname-label">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="label" translatable="yes"><span size="x-large">%R</span></property>
5a644f9
-				  <property name="use_underline">False</property>
5a644f9
-				  <property name="use_markup">True</property>
5a644f9
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-				  <property name="wrap">False</property>
5a644f9
-				  <property name="selectable">False</property>
5a644f9
-				  <property name="xalign">0.5</property>
5a644f9
-				  <property name="yalign">0.5</property>
5a644f9
-				  <property name="xpad">0</property>
5a644f9
-				  <property name="ypad">0</property>
5a644f9
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-				  <property name="width_chars">-1</property>
5a644f9
-				  <property name="single_line_mode">False</property>
5a644f9
-				  <property name="angle">0</property>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">False</property>
5a644f9
-				  <property name="fill">False</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkLabel" id="auth-username-label">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="label" translatable="yes"><span size="small">%U on %h</span></property>
5a644f9
-				  <property name="use_underline">False</property>
5a644f9
-				  <property name="use_markup">True</property>
5a644f9
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-				  <property name="wrap">False</property>
5a644f9
-				  <property name="selectable">False</property>
5a644f9
-				  <property name="xalign">0.5</property>
5a644f9
-				  <property name="yalign">0.5</property>
5a644f9
-				  <property name="xpad">0</property>
5a644f9
-				  <property name="ypad">0</property>
5a644f9
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-				  <property name="width_chars">-1</property>
5a644f9
-				  <property name="single_line_mode">False</property>
5a644f9
-				  <property name="angle">0</property>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">False</property>
5a644f9
-				  <property name="fill">False</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="padding">0</property>
5a644f9
-			      <property name="expand">True</property>
5a644f9
-			      <property name="fill">True</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkLabel" id="status-message-label">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="label" translatable="yes"></property>
5a644f9
-			      <property name="use_underline">False</property>
5a644f9
-			      <property name="use_markup">False</property>
5a644f9
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-			      <property name="wrap">True</property>
5a644f9
-			      <property name="selectable">False</property>
5a644f9
-			      <property name="xalign">0.5</property>
5a644f9
-			      <property name="yalign">0.5</property>
5a644f9
-			      <property name="xpad">0</property>
5a644f9
-			      <property name="ypad">0</property>
5a644f9
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-			      <property name="width_chars">-1</property>
5a644f9
-			      <property name="single_line_mode">False</property>
5a644f9
-			      <property name="angle">0</property>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="padding">0</property>
5a644f9
-			      <property name="expand">True</property>
5a644f9
-			      <property name="fill">True</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkVBox" id="auth-prompt-box">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="homogeneous">False</property>
5a644f9
-			      <property name="spacing">0</property>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkHBox" id="hbox1">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="homogeneous">False</property>
5a644f9
-				  <property name="spacing">6</property>
5a644f9
-
5a644f9
-				  <child>
5a644f9
-				    <widget class="GtkLabel" id="auth-prompt-label">
5a644f9
-				      <property name="label" translatable="yes"></property>
5a644f9
-				      <property name="use_underline">False</property>
5a644f9
-				      <property name="use_markup">False</property>
5a644f9
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-				      <property name="wrap">False</property>
5a644f9
-				      <property name="selectable">False</property>
5a644f9
-				      <property name="xalign">0</property>
5a644f9
-				      <property name="yalign">0.5</property>
5a644f9
-				      <property name="xpad">0</property>
5a644f9
-				      <property name="ypad">0</property>
5a644f9
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-				      <property name="width_chars">-1</property>
5a644f9
-				      <property name="single_line_mode">False</property>
5a644f9
-				      <property name="angle">0</property>
5a644f9
-				    </widget>
5a644f9
-				    <packing>
5a644f9
-				      <property name="padding">0</property>
5a644f9
-				      <property name="expand">False</property>
5a644f9
-				      <property name="fill">False</property>
5a644f9
-				    </packing>
5a644f9
-				  </child>
5a644f9
-
5a644f9
-				  <child>
5a644f9
-				    <widget class="GtkEntry" id="auth-prompt-entry">
5a644f9
-				      <property name="can_focus">True</property>
5a644f9
-				      <property name="editable">True</property>
5a644f9
-				      <property name="visibility">False</property>
5a644f9
-				      <property name="max_length">0</property>
5a644f9
-				      <property name="text" translatable="yes"></property>
5a644f9
-				      <property name="has_frame">True</property>
5a644f9
-				      <property name="activates_default">True</property>
5a644f9
-				    </widget>
5a644f9
-				    <packing>
5a644f9
-				      <property name="padding">0</property>
5a644f9
-				      <property name="expand">True</property>
5a644f9
-				      <property name="fill">True</property>
5a644f9
-				    </packing>
5a644f9
-				  </child>
5a644f9
-
5a644f9
-				  <child>
5a644f9
-				    <widget class="GtkHBox" id="auth-prompt-kbd-layout-indicator">
5a644f9
-				      <property name="visible">True</property>
5a644f9
-				      <property name="homogeneous">False</property>
5a644f9
-				      <property name="spacing">0</property>
5a644f9
-
5a644f9
-				      <child>
5a644f9
-					<placeholder/>
5a644f9
-				      </child>
5a644f9
-				    </widget>
5a644f9
-				    <packing>
5a644f9
-				      <property name="padding">0</property>
5a644f9
-				      <property name="expand">False</property>
5a644f9
-				      <property name="fill">True</property>
5a644f9
-				    </packing>
5a644f9
-				  </child>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">True</property>
5a644f9
-				  <property name="fill">True</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkLabel" id="auth-capslock-label">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="label" translatable="yes"></property>
5a644f9
-				  <property name="use_underline">False</property>
5a644f9
-				  <property name="use_markup">False</property>
5a644f9
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-				  <property name="wrap">False</property>
5a644f9
-				  <property name="selectable">False</property>
5a644f9
-				  <property name="xalign">0.5</property>
5a644f9
-				  <property name="yalign">0.5</property>
5a644f9
-				  <property name="xpad">0</property>
5a644f9
-				  <property name="ypad">0</property>
5a644f9
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-				  <property name="width_chars">-1</property>
5a644f9
-				  <property name="single_line_mode">False</property>
5a644f9
-				  <property name="angle">0</property>
5a644f9
-				</widget>
5a644f9
-				<packing>
5a644f9
-				  <property name="padding">0</property>
5a644f9
-				  <property name="expand">False</property>
5a644f9
-				  <property name="fill">False</property>
5a644f9
-				</packing>
5a644f9
-			      </child>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="padding">0</property>
5a644f9
-			      <property name="expand">True</property>
5a644f9
-			      <property name="fill">True</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkLabel" id="auth-status-label">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="label" translatable="yes"></property>
5a644f9
-			      <property name="use_underline">False</property>
5a644f9
-			      <property name="use_markup">False</property>
5a644f9
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-			      <property name="wrap">False</property>
5a644f9
-			      <property name="selectable">False</property>
5a644f9
-			      <property name="xalign">0.5</property>
5a644f9
-			      <property name="yalign">0.5</property>
5a644f9
-			      <property name="xpad">0</property>
5a644f9
-			      <property name="ypad">0</property>
5a644f9
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-			      <property name="width_chars">-1</property>
5a644f9
-			      <property name="single_line_mode">False</property>
5a644f9
-			      <property name="angle">0</property>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="padding">0</property>
5a644f9
-			      <property name="expand">False</property>
5a644f9
-			      <property name="fill">False</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkHButtonBox" id="auth-action-area">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="layout_style">GTK_BUTTONBOX_END</property>
5a644f9
-			      <property name="spacing">6</property>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkButton" id="auth-note-button">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_default">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="label" translatable="yes">_Leave Message</property>
5a644f9
-				  <property name="use_underline">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">False</property>
5a644f9
-				</widget>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkButton" id="auth-switch-button">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_default">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="label" translatable="yes">_Switch User</property>
5a644f9
-				  <property name="use_underline">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">False</property>
5a644f9
-				</widget>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkButton" id="auth-logout-button">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_default">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="label" translatable="yes">_Log Out</property>
5a644f9
-				  <property name="use_underline">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">False</property>
5a644f9
-				</widget>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkButton" id="auth-cancel-button">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_default">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="label" translatable="yes">_Cancel</property>
5a644f9
-				  <property name="use_underline">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">False</property>
5a644f9
-				</widget>
5a644f9
-			      </child>
5a644f9
-
5a644f9
-			      <child>
5a644f9
-				<widget class="GtkButton" id="auth-unlock-button">
5a644f9
-				  <property name="visible">True</property>
5a644f9
-				  <property name="can_default">True</property>
5a644f9
-				  <property name="can_focus">True</property>
5a644f9
-				  <property name="label" translatable="yes">_Unlock</property>
5a644f9
-				  <property name="use_underline">True</property>
5a644f9
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-				  <property name="focus_on_click">True</property>
5a644f9
-				</widget>
5a644f9
-			      </child>
5a644f9
-			    </widget>
5a644f9
-			    <packing>
5a644f9
-			      <property name="padding">0</property>
5a644f9
-			      <property name="expand">True</property>
5a644f9
-			      <property name="fill">True</property>
5a644f9
-			    </packing>
5a644f9
-			  </child>
5a644f9
-			</widget>
5a644f9
-		      </child>
5a644f9
-		    </widget>
5a644f9
-		    <packing>
5a644f9
-		      <property name="tab_expand">False</property>
5a644f9
-		      <property name="tab_fill">True</property>
5a644f9
-		    </packing>
5a644f9
-		  </child>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkLabel" id="label1">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="label" translatable="yes"></property>
5a644f9
-		      <property name="use_underline">False</property>
5a644f9
-		      <property name="use_markup">False</property>
5a644f9
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-		      <property name="wrap">False</property>
5a644f9
-		      <property name="selectable">False</property>
5a644f9
-		      <property name="xalign">0.5</property>
5a644f9
-		      <property name="yalign">0.5</property>
5a644f9
-		      <property name="xpad">0</property>
5a644f9
-		      <property name="ypad">0</property>
5a644f9
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-		      <property name="width_chars">-1</property>
5a644f9
-		      <property name="single_line_mode">False</property>
5a644f9
-		      <property name="angle">0</property>
5a644f9
-		    </widget>
5a644f9
-		    <packing>
5a644f9
-		      <property name="type">tab</property>
5a644f9
-		    </packing>
5a644f9
-		  </child>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkVBox" id="note-tab">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="homogeneous">False</property>
5a644f9
-		      <property name="spacing">10</property>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkLabel" id="note-tab-label">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="label" translatable="yes"><b>Leave a message for %R:</b></property>
5a644f9
-			  <property name="use_underline">False</property>
5a644f9
-			  <property name="use_markup">True</property>
5a644f9
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-			  <property name="wrap">False</property>
5a644f9
-			  <property name="selectable">False</property>
5a644f9
-			  <property name="xalign">0</property>
5a644f9
-			  <property name="yalign">0.5</property>
5a644f9
-			  <property name="xpad">0</property>
5a644f9
-			  <property name="ypad">0</property>
5a644f9
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-			  <property name="width_chars">-1</property>
5a644f9
-			  <property name="single_line_mode">False</property>
5a644f9
-			  <property name="angle">0</property>
5a644f9
-			</widget>
5a644f9
-			<packing>
5a644f9
-			  <property name="padding">0</property>
5a644f9
-			  <property name="expand">False</property>
5a644f9
-			  <property name="fill">False</property>
5a644f9
-			</packing>
5a644f9
-		      </child>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkScrolledWindow" id="scrolledwindow1">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="can_focus">True</property>
5a644f9
-			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
5a644f9
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
5a644f9
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
5a644f9
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkTextView" id="note-text-view">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="can_focus">True</property>
5a644f9
-			      <property name="editable">True</property>
5a644f9
-			      <property name="overwrite">False</property>
5a644f9
-			      <property name="accepts_tab">True</property>
5a644f9
-			      <property name="justification">GTK_JUSTIFY_LEFT</property>
5a644f9
-			      <property name="wrap_mode">GTK_WRAP_WORD</property>
5a644f9
-			      <property name="cursor_visible">True</property>
5a644f9
-			      <property name="pixels_above_lines">0</property>
5a644f9
-			      <property name="pixels_below_lines">0</property>
5a644f9
-			      <property name="pixels_inside_wrap">0</property>
5a644f9
-			      <property name="left_margin">0</property>
5a644f9
-			      <property name="right_margin">0</property>
5a644f9
-			      <property name="indent">0</property>
5a644f9
-			      <property name="text" translatable="yes"></property>
5a644f9
-			    </widget>
5a644f9
-			  </child>
5a644f9
-			</widget>
5a644f9
-			<packing>
5a644f9
-			  <property name="padding">0</property>
5a644f9
-			  <property name="expand">True</property>
5a644f9
-			  <property name="fill">True</property>
5a644f9
-			</packing>
5a644f9
-		      </child>
5a644f9
-
5a644f9
-		      <child>
5a644f9
-			<widget class="GtkHButtonBox" id="hbuttonbox1">
5a644f9
-			  <property name="visible">True</property>
5a644f9
-			  <property name="layout_style">GTK_BUTTONBOX_END</property>
5a644f9
-			  <property name="spacing">6</property>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkButton" id="note-cancel-button">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="can_default">True</property>
5a644f9
-			      <property name="can_focus">True</property>
5a644f9
-			      <property name="label">gtk-cancel</property>
5a644f9
-			      <property name="use_stock">True</property>
5a644f9
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-			      <property name="focus_on_click">True</property>
5a644f9
-			    </widget>
5a644f9
-			  </child>
5a644f9
-
5a644f9
-			  <child>
5a644f9
-			    <widget class="GtkButton" id="note-ok-button">
5a644f9
-			      <property name="visible">True</property>
5a644f9
-			      <property name="can_default">True</property>
5a644f9
-			      <property name="can_focus">True</property>
5a644f9
-			      <property name="label">gtk-save</property>
5a644f9
-			      <property name="use_stock">True</property>
5a644f9
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
-			      <property name="focus_on_click">True</property>
5a644f9
-			    </widget>
5a644f9
-			  </child>
5a644f9
-			</widget>
5a644f9
-			<packing>
5a644f9
-			  <property name="padding">0</property>
5a644f9
-			  <property name="expand">False</property>
5a644f9
-			  <property name="fill">False</property>
5a644f9
-			</packing>
5a644f9
-		      </child>
5a644f9
-		    </widget>
5a644f9
-		    <packing>
5a644f9
-		      <property name="tab_expand">False</property>
5a644f9
-		      <property name="tab_fill">True</property>
5a644f9
-		    </packing>
5a644f9
-		  </child>
5a644f9
-
5a644f9
-		  <child>
5a644f9
-		    <widget class="GtkLabel" id="label9">
5a644f9
-		      <property name="visible">True</property>
5a644f9
-		      <property name="label" translatable="yes"></property>
5a644f9
-		      <property name="use_underline">False</property>
5a644f9
-		      <property name="use_markup">False</property>
5a644f9
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
-		      <property name="wrap">False</property>
5a644f9
-		      <property name="selectable">False</property>
5a644f9
-		      <property name="xalign">0.5</property>
5a644f9
-		      <property name="yalign">0.5</property>
5a644f9
-		      <property name="xpad">0</property>
5a644f9
-		      <property name="ypad">0</property>
5a644f9
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
-		      <property name="width_chars">-1</property>
5a644f9
-		      <property name="single_line_mode">False</property>
5a644f9
-		      <property name="angle">0</property>
5a644f9
-		    </widget>
5a644f9
-		    <packing>
5a644f9
-		      <property name="type">tab</property>
5a644f9
-		    </packing>
5a644f9
-		  </child>
5a644f9
-		</widget>
5a644f9
-		<packing>
5a644f9
-		  <property name="padding">0</property>
5a644f9
-		  <property name="expand">True</property>
5a644f9
-		  <property name="fill">True</property>
5a644f9
-		</packing>
5a644f9
-	      </child>
5a644f9
-	    </widget>
5a644f9
-	  </child>
5a644f9
-	</widget>
5a644f9
-      </child>
5a644f9
-
5a644f9
-      <child>
5a644f9
-	<placeholder/>
5a644f9
-      </child>
5a644f9
-    </widget>
5a644f9
-  </child>
5a644f9
-</widget>
5a644f9
-
5a644f9
-</glade-interface>
5a644f9
diff --git a/data/lock-dialog-default.ui b/data/lock-dialog-default.ui
5a644f9
new file mode 100644
5a644f9
index 0000000..6b90c29
5a644f9
--- /dev/null
5a644f9
+++ b/data/lock-dialog-default.ui
5a644f9
@@ -0,0 +1,523 @@
5a644f9
+
5a644f9
+
5a644f9
+<interface>
5a644f9
+  <object class="GtkWindow" id="window1">
5a644f9
+    <property name="visible">True</property>
5a644f9
+    <property name="title" translatable="yes">window1</property>
5a644f9
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
5a644f9
+    <property name="window_position">GTK_WIN_POS_NONE</property>
5a644f9
+    <property name="modal">False</property>
5a644f9
+    <property name="resizable">True</property>
5a644f9
+    <property name="destroy_with_parent">False</property>
5a644f9
+    <property name="decorated">True</property>
5a644f9
+    <property name="skip_taskbar_hint">False</property>
5a644f9
+    <property name="skip_pager_hint">False</property>
5a644f9
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
5a644f9
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5a644f9
+    <property name="focus_on_map">True</property>
5a644f9
+    <property name="urgency_hint">False</property>
5a644f9
+    <child>
5a644f9
+      <object class="GtkFrame" id="lock-dialog">
5a644f9
+        <property name="visible">True</property>
5a644f9
+        <property name="label_xalign">0</property>
5a644f9
+        <property name="label_yalign">0.5</property>
5a644f9
+        <property name="shadow_type">GTK_SHADOW_OUT</property>
5a644f9
+        <child>
5a644f9
+          <object class="GtkAlignment" id="alignment1">
5a644f9
+            <property name="border_width">12</property>
5a644f9
+            <property name="visible">True</property>
5a644f9
+            <property name="xalign">0.5</property>
5a644f9
+            <property name="yalign">0.5</property>
5a644f9
+            <property name="xscale">1</property>
5a644f9
+            <property name="yscale">1</property>
5a644f9
+            <property name="top_padding">0</property>
5a644f9
+            <property name="bottom_padding">0</property>
5a644f9
+            <property name="left_padding">0</property>
5a644f9
+            <property name="right_padding">0</property>
5a644f9
+            <child>
5a644f9
+              <object class="GtkVBox" id="lock-box">
5a644f9
+                <property name="border_width">18</property>
5a644f9
+                <property name="visible">True</property>
5a644f9
+                <property name="homogeneous">False</property>
5a644f9
+                <property name="spacing">0</property>
5a644f9
+                <child>
5a644f9
+                  <object class="GtkNotebook" id="notebook">
5a644f9
+                    <property name="visible">True</property>
5a644f9
+                    <property name="show_tabs">False</property>
5a644f9
+                    <property name="show_border">False</property>
5a644f9
+                    <property name="tab_pos">GTK_POS_TOP</property>
5a644f9
+                    <property name="scrollable">False</property>
5a644f9
+                    <property name="enable_popup">False</property>
5a644f9
+                    <child>
5a644f9
+                      <object class="GtkAlignment" id="alignment2">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="xalign">0.5</property>
5a644f9
+                        <property name="yalign">0.5</property>
5a644f9
+                        <property name="xscale">1</property>
5a644f9
+                        <property name="yscale">1</property>
5a644f9
+                        <property name="top_padding">0</property>
5a644f9
+                        <property name="bottom_padding">0</property>
5a644f9
+                        <property name="left_padding">0</property>
5a644f9
+                        <property name="right_padding">0</property>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkVBox" id="vbox2">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="homogeneous">False</property>
5a644f9
+                            <property name="spacing">12</property>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkImage" id="auth-face-image">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="xalign">0.5</property>
5a644f9
+                                <property name="yalign">1</property>
5a644f9
+                                <property name="xpad">0</property>
5a644f9
+                                <property name="ypad">0</property>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="padding">0</property>
5a644f9
+                                <property name="expand">True</property>
5a644f9
+                                <property name="fill">True</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkVBox" id="vbox3">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="homogeneous">False</property>
5a644f9
+                                <property name="spacing">0</property>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkLabel" id="auth-realname-label">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="label" translatable="yes"><span size="x-large">%R</span></property>
5a644f9
+                                    <property name="use_underline">False</property>
5a644f9
+                                    <property name="use_markup">True</property>
5a644f9
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                    <property name="wrap">False</property>
5a644f9
+                                    <property name="selectable">False</property>
5a644f9
+                                    <property name="xalign">0.5</property>
5a644f9
+                                    <property name="yalign">0.5</property>
5a644f9
+                                    <property name="xpad">0</property>
5a644f9
+                                    <property name="ypad">0</property>
5a644f9
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                    <property name="width_chars">-1</property>
5a644f9
+                                    <property name="single_line_mode">False</property>
5a644f9
+                                    <property name="angle">0</property>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">False</property>
5a644f9
+                                    <property name="fill">False</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkLabel" id="auth-username-label">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="label" translatable="yes"><span size="small">%U on %h</span></property>
5a644f9
+                                    <property name="use_underline">False</property>
5a644f9
+                                    <property name="use_markup">True</property>
5a644f9
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                    <property name="wrap">False</property>
5a644f9
+                                    <property name="selectable">False</property>
5a644f9
+                                    <property name="xalign">0.5</property>
5a644f9
+                                    <property name="yalign">0.5</property>
5a644f9
+                                    <property name="xpad">0</property>
5a644f9
+                                    <property name="ypad">0</property>
5a644f9
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                    <property name="width_chars">-1</property>
5a644f9
+                                    <property name="single_line_mode">False</property>
5a644f9
+                                    <property name="angle">0</property>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">False</property>
5a644f9
+                                    <property name="fill">False</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="padding">0</property>
5a644f9
+                                <property name="expand">True</property>
5a644f9
+                                <property name="fill">True</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkLabel" id="status-message-label">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="label" translatable="yes"/>
5a644f9
+                                <property name="use_underline">False</property>
5a644f9
+                                <property name="use_markup">False</property>
5a644f9
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                <property name="wrap">True</property>
5a644f9
+                                <property name="selectable">False</property>
5a644f9
+                                <property name="xalign">0.5</property>
5a644f9
+                                <property name="yalign">0.5</property>
5a644f9
+                                <property name="xpad">0</property>
5a644f9
+                                <property name="ypad">0</property>
5a644f9
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                <property name="width_chars">-1</property>
5a644f9
+                                <property name="single_line_mode">False</property>
5a644f9
+                                <property name="angle">0</property>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="padding">0</property>
5a644f9
+                                <property name="expand">True</property>
5a644f9
+                                <property name="fill">True</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkVBox" id="auth-prompt-box">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="homogeneous">False</property>
5a644f9
+                                <property name="spacing">0</property>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkHBox" id="hbox1">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="homogeneous">False</property>
5a644f9
+                                    <property name="spacing">6</property>
5a644f9
+                                    <child>
5a644f9
+                                      <object class="GtkLabel" id="auth-prompt-label">
5a644f9
+                                        <property name="label" translatable="yes"/>
5a644f9
+                                        <property name="use_underline">False</property>
5a644f9
+                                        <property name="use_markup">False</property>
5a644f9
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                        <property name="wrap">False</property>
5a644f9
+                                        <property name="selectable">False</property>
5a644f9
+                                        <property name="xalign">0</property>
5a644f9
+                                        <property name="yalign">0.5</property>
5a644f9
+                                        <property name="xpad">0</property>
5a644f9
+                                        <property name="ypad">0</property>
5a644f9
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                        <property name="width_chars">-1</property>
5a644f9
+                                        <property name="single_line_mode">False</property>
5a644f9
+                                        <property name="angle">0</property>
5a644f9
+                                      </object>
5a644f9
+                                      <packing>
5a644f9
+                                        <property name="padding">0</property>
5a644f9
+                                        <property name="expand">False</property>
5a644f9
+                                        <property name="fill">False</property>
5a644f9
+                                      </packing>
5a644f9
+                                    </child>
5a644f9
+                                    <child>
5a644f9
+                                      <object class="GtkEntry" id="auth-prompt-entry">
5a644f9
+                                        <property name="can_focus">True</property>
5a644f9
+                                        <property name="editable">True</property>
5a644f9
+                                        <property name="visibility">False</property>
5a644f9
+                                        <property name="max_length">0</property>
5a644f9
+                                        <property name="text" translatable="yes"/>
5a644f9
+                                        <property name="has_frame">True</property>
5a644f9
+                                        <property name="activates_default">True</property>
5a644f9
+                                      </object>
5a644f9
+                                      <packing>
5a644f9
+                                        <property name="padding">0</property>
5a644f9
+                                        <property name="expand">True</property>
5a644f9
+                                        <property name="fill">True</property>
5a644f9
+                                      </packing>
5a644f9
+                                    </child>
5a644f9
+                                    <child>
5a644f9
+                                      <object class="GtkHBox" id="auth-prompt-kbd-layout-indicator">
5a644f9
+                                        <property name="visible">True</property>
5a644f9
+                                        <property name="homogeneous">False</property>
5a644f9
+                                        <property name="spacing">0</property>
5a644f9
+                                        <child>
5a644f9
+                                          <placeholder/>
5a644f9
+                                        </child>
5a644f9
+                                      </object>
5a644f9
+                                      <packing>
5a644f9
+                                        <property name="padding">0</property>
5a644f9
+                                        <property name="expand">False</property>
5a644f9
+                                        <property name="fill">True</property>
5a644f9
+                                      </packing>
5a644f9
+                                    </child>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">True</property>
5a644f9
+                                    <property name="fill">True</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkLabel" id="auth-capslock-label">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="label" translatable="yes"/>
5a644f9
+                                    <property name="use_underline">False</property>
5a644f9
+                                    <property name="use_markup">False</property>
5a644f9
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                    <property name="wrap">False</property>
5a644f9
+                                    <property name="selectable">False</property>
5a644f9
+                                    <property name="xalign">0.5</property>
5a644f9
+                                    <property name="yalign">0.5</property>
5a644f9
+                                    <property name="xpad">0</property>
5a644f9
+                                    <property name="ypad">0</property>
5a644f9
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                    <property name="width_chars">-1</property>
5a644f9
+                                    <property name="single_line_mode">False</property>
5a644f9
+                                    <property name="angle">0</property>
5a644f9
+                                  </object>
5a644f9
+                                  <packing>
5a644f9
+                                    <property name="padding">0</property>
5a644f9
+                                    <property name="expand">False</property>
5a644f9
+                                    <property name="fill">False</property>
5a644f9
+                                  </packing>
5a644f9
+                                </child>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="padding">0</property>
5a644f9
+                                <property name="expand">True</property>
5a644f9
+                                <property name="fill">True</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkLabel" id="auth-status-label">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="label" translatable="yes"/>
5a644f9
+                                <property name="use_underline">False</property>
5a644f9
+                                <property name="use_markup">False</property>
5a644f9
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                <property name="wrap">False</property>
5a644f9
+                                <property name="selectable">False</property>
5a644f9
+                                <property name="xalign">0.5</property>
5a644f9
+                                <property name="yalign">0.5</property>
5a644f9
+                                <property name="xpad">0</property>
5a644f9
+                                <property name="ypad">0</property>
5a644f9
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                                <property name="width_chars">-1</property>
5a644f9
+                                <property name="single_line_mode">False</property>
5a644f9
+                                <property name="angle">0</property>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="padding">0</property>
5a644f9
+                                <property name="expand">False</property>
5a644f9
+                                <property name="fill">False</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkHButtonBox" id="auth-action-area">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="layout_style">GTK_BUTTONBOX_END</property>
5a644f9
+                                <property name="spacing">6</property>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkButton" id="auth-note-button">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_default">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="label" translatable="yes">_Leave Message</property>
5a644f9
+                                    <property name="use_underline">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">False</property>
5a644f9
+                                  </object>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkButton" id="auth-switch-button">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_default">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="label" translatable="yes">_Switch User</property>
5a644f9
+                                    <property name="use_underline">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">False</property>
5a644f9
+                                  </object>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkButton" id="auth-logout-button">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_default">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="label" translatable="yes">_Log Out</property>
5a644f9
+                                    <property name="use_underline">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">False</property>
5a644f9
+                                  </object>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkButton" id="auth-cancel-button">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_default">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="label" translatable="yes">_Cancel</property>
5a644f9
+                                    <property name="use_underline">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">False</property>
5a644f9
+                                  </object>
5a644f9
+                                </child>
5a644f9
+                                <child>
5a644f9
+                                  <object class="GtkButton" id="auth-unlock-button">
5a644f9
+                                    <property name="visible">True</property>
5a644f9
+                                    <property name="can_default">True</property>
5a644f9
+                                    <property name="can_focus">True</property>
5a644f9
+                                    <property name="label" translatable="yes">_Unlock</property>
5a644f9
+                                    <property name="use_underline">True</property>
5a644f9
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                    <property name="focus_on_click">True</property>
5a644f9
+                                  </object>
5a644f9
+                                </child>
5a644f9
+                              </object>
5a644f9
+                              <packing>
5a644f9
+                                <property name="padding">0</property>
5a644f9
+                                <property name="expand">True</property>
5a644f9
+                                <property name="fill">True</property>
5a644f9
+                              </packing>
5a644f9
+                            </child>
5a644f9
+                          </object>
5a644f9
+                        </child>
5a644f9
+                      </object>
5a644f9
+                      <packing>
5a644f9
+                        <property name="tab_expand">False</property>
5a644f9
+                        <property name="tab_fill">True</property>
5a644f9
+                      </packing>
5a644f9
+                    </child>
5a644f9
+                    <child type="tab">
5a644f9
+                      <object class="GtkLabel" id="label1">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="label" translatable="yes"/>
5a644f9
+                        <property name="use_underline">False</property>
5a644f9
+                        <property name="use_markup">False</property>
5a644f9
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                        <property name="wrap">False</property>
5a644f9
+                        <property name="selectable">False</property>
5a644f9
+                        <property name="xalign">0.5</property>
5a644f9
+                        <property name="yalign">0.5</property>
5a644f9
+                        <property name="xpad">0</property>
5a644f9
+                        <property name="ypad">0</property>
5a644f9
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                        <property name="width_chars">-1</property>
5a644f9
+                        <property name="single_line_mode">False</property>
5a644f9
+                        <property name="angle">0</property>
5a644f9
+                      </object>
5a644f9
+                    </child>
5a644f9
+                    <child>
5a644f9
+                      <object class="GtkVBox" id="note-tab">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="homogeneous">False</property>
5a644f9
+                        <property name="spacing">10</property>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkLabel" id="note-tab-label">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="label" translatable="yes"><b>Leave a message for %R:</b></property>
5a644f9
+                            <property name="use_underline">False</property>
5a644f9
+                            <property name="use_markup">True</property>
5a644f9
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                            <property name="wrap">False</property>
5a644f9
+                            <property name="selectable">False</property>
5a644f9
+                            <property name="xalign">0</property>
5a644f9
+                            <property name="yalign">0.5</property>
5a644f9
+                            <property name="xpad">0</property>
5a644f9
+                            <property name="ypad">0</property>
5a644f9
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                            <property name="width_chars">-1</property>
5a644f9
+                            <property name="single_line_mode">False</property>
5a644f9
+                            <property name="angle">0</property>
5a644f9
+                          </object>
5a644f9
+                          <packing>
5a644f9
+                            <property name="padding">0</property>
5a644f9
+                            <property name="expand">False</property>
5a644f9
+                            <property name="fill">False</property>
5a644f9
+                          </packing>
5a644f9
+                        </child>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkScrolledWindow" id="scrolledwindow1">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="can_focus">True</property>
5a644f9
+                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
5a644f9
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
5a644f9
+                            <property name="shadow_type">GTK_SHADOW_IN</property>
5a644f9
+                            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkTextView" id="note-text-view">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="can_focus">True</property>
5a644f9
+                                <property name="editable">True</property>
5a644f9
+                                <property name="overwrite">False</property>
5a644f9
+                                <property name="accepts_tab">True</property>
5a644f9
+                                <property name="justification">GTK_JUSTIFY_LEFT</property>
5a644f9
+                                <property name="wrap_mode">GTK_WRAP_WORD</property>
5a644f9
+                                <property name="cursor_visible">True</property>
5a644f9
+                                <property name="pixels_above_lines">0</property>
5a644f9
+                                <property name="pixels_below_lines">0</property>
5a644f9
+                                <property name="pixels_inside_wrap">0</property>
5a644f9
+                                <property name="left_margin">0</property>
5a644f9
+                                <property name="right_margin">0</property>
5a644f9
+                                <property name="indent">0</property>
5a644f9
+                              </object>
5a644f9
+                            </child>
5a644f9
+                          </object>
5a644f9
+                          <packing>
5a644f9
+                            <property name="padding">0</property>
5a644f9
+                            <property name="expand">True</property>
5a644f9
+                            <property name="fill">True</property>
5a644f9
+                          </packing>
5a644f9
+                        </child>
5a644f9
+                        <child>
5a644f9
+                          <object class="GtkHButtonBox" id="hbuttonbox1">
5a644f9
+                            <property name="visible">True</property>
5a644f9
+                            <property name="layout_style">GTK_BUTTONBOX_END</property>
5a644f9
+                            <property name="spacing">6</property>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkButton" id="note-cancel-button">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="can_default">True</property>
5a644f9
+                                <property name="can_focus">True</property>
5a644f9
+                                <property name="label">gtk-cancel</property>
5a644f9
+                                <property name="use_stock">True</property>
5a644f9
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                <property name="focus_on_click">True</property>
5a644f9
+                              </object>
5a644f9
+                            </child>
5a644f9
+                            <child>
5a644f9
+                              <object class="GtkButton" id="note-ok-button">
5a644f9
+                                <property name="visible">True</property>
5a644f9
+                                <property name="can_default">True</property>
5a644f9
+                                <property name="can_focus">True</property>
5a644f9
+                                <property name="label">gtk-save</property>
5a644f9
+                                <property name="use_stock">True</property>
5a644f9
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
5a644f9
+                                <property name="focus_on_click">True</property>
5a644f9
+                              </object>
5a644f9
+                            </child>
5a644f9
+                          </object>
5a644f9
+                          <packing>
5a644f9
+                            <property name="padding">0</property>
5a644f9
+                            <property name="expand">False</property>
5a644f9
+                            <property name="fill">False</property>
5a644f9
+                          </packing>
5a644f9
+                        </child>
5a644f9
+                      </object>
5a644f9
+                      <packing>
5a644f9
+                        <property name="tab_expand">False</property>
5a644f9
+                        <property name="tab_fill">True</property>
5a644f9
+                      </packing>
5a644f9
+                    </child>
5a644f9
+                    <child type="tab">
5a644f9
+                      <object class="GtkLabel" id="label9">
5a644f9
+                        <property name="visible">True</property>
5a644f9
+                        <property name="label" translatable="yes"/>
5a644f9
+                        <property name="use_underline">False</property>
5a644f9
+                        <property name="use_markup">False</property>
5a644f9
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
5a644f9
+                        <property name="wrap">False</property>
5a644f9
+                        <property name="selectable">False</property>
5a644f9
+                        <property name="xalign">0.5</property>
5a644f9
+                        <property name="yalign">0.5</property>
5a644f9
+                        <property name="xpad">0</property>
5a644f9
+                        <property name="ypad">0</property>
5a644f9
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5a644f9
+                        <property name="width_chars">-1</property>
5a644f9
+                        <property name="single_line_mode">False</property>
5a644f9
+                        <property name="angle">0</property>
5a644f9
+                      </object>
5a644f9
+                    </child>
5a644f9
+                  </object>
5a644f9
+                  <packing>
5a644f9
+                    <property name="padding">0</property>
5a644f9
+                    <property name="expand">True</property>
5a644f9
+                    <property name="fill">True</property>
5a644f9
+                  </packing>
5a644f9
+                </child>
5a644f9
+              </object>
5a644f9
+            </child>
5a644f9
+          </object>
5a644f9
+        </child>
5a644f9
+        <child>
5a644f9
+          <placeholder/>
5a644f9
+        </child>
5a644f9
+      </object>
5a644f9
+    </child>
5a644f9
+  </object>
5a644f9
+</interface>
5a644f9
diff --git a/po/POTFILES.in b/po/POTFILES.in
5a644f9
index cf5c1ad..c965e8a 100644
5a644f9
--- a/po/POTFILES.in
5a644f9
+++ b/po/POTFILES.in
5a644f9
@@ -1,10 +1,10 @@
5a644f9
 # List of source files containing translatable strings.
5a644f9
 # Please keep this file sorted alphabetically.
5a644f9
 data/gnome-screensaver-preferences.desktop.in
5a644f9
-data/gnome-screensaver-preferences.glade
5a644f9
+[type: gettext/glade]data/gnome-screensaver-preferences.ui
5a644f9
 data/gnome-screensaver.directory.in
5a644f9
 data/gnome-screensaver.schemas.in
5a644f9
-data/lock-dialog-default.glade
5a644f9
+[type: gettext/glade]data/lock-dialog-default.ui
5a644f9
 savers/cosmos-slideshow.desktop.in.in
5a644f9
 savers/footlogo-floaters.desktop.in.in
5a644f9
 savers/personal-slideshow.desktop.in.in
5a644f9
diff --git a/src/Makefile.am b/src/Makefile.am
5a644f9
index aac7b65..290aac1 100644
5a644f9
--- a/src/Makefile.am
5a644f9
+++ b/src/Makefile.am
5a644f9
@@ -23,7 +23,7 @@ INCLUDES =							\
5a644f9
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		\
5a644f9
 	-DSAVERDIR=\""$(saverdir)"\"				\
5a644f9
 	-DTHEMESDIR=\""$(themesdir)"\"				\
5a644f9
-	-DGLADEDIR=\"$(pkgdatadir)\"				\
5a644f9
+	-DGTKBUILDERDIR=\"$(pkgdatadir)\"				\
5a644f9
 	-DPAM_SERVICE_NAME=\""gnome-screensaver"\"		\
5a644f9
 	$(WARN_CFLAGS)						\
5a644f9
 	$(AUTH_CFLAGS)						\
5a644f9
diff --git a/src/gnome-screensaver-preferences.c b/src/gnome-screensaver-preferences.c
5a644f9
index 4e600d4..d8376fb 100644
5a644f9
--- a/src/gnome-screensaver-preferences.c
5a644f9
+++ b/src/gnome-screensaver-preferences.c
5a644f9
@@ -33,7 +33,6 @@
5a644f9
 #include <glib/gi18n.h>
5a644f9
 #include <gdk/gdkx.h>
5a644f9
 #include <gtk/gtk.h>
5a644f9
-#include <glade/glade.h>
5a644f9
 #include <gconf/gconf-client.h>
5a644f9
 
5a644f9
 #include <gio/gio.h>
5a644f9
@@ -44,7 +43,7 @@
5a644f9
 #include "gs-job.h"
5a644f9
 #include "gs-prefs.h" /* for GS_MODE enum */
5a644f9
 
5a644f9
-#define GLADE_XML_FILE "gnome-screensaver-preferences.glade"
5a644f9
+#define GTK_BUILDER_FILE "gnome-screensaver-preferences.ui"
5a644f9
 
5a644f9
 #define GNOME_LOCKDOWN_DIR  "/desktop/gnome/lockdown"
5a644f9
 #define KEY_LOCK_DISABLE    GNOME_LOCKDOWN_DIR "/disable_lock_screen"
5a644f9
@@ -86,7 +85,7 @@ static GtkTargetEntry drop_types [] =
5a644f9
         { "_NETSCAPE_URL", 0, TARGET_NS_URL }
5a644f9
 };
5a644f9
 
5a644f9
-static GladeXML       *xml = NULL;
5a644f9
+static GtkBuilder       *builder = NULL;
5a644f9
 static GSThemeManager *theme_manager = NULL;
5a644f9
 static GSJob          *job = NULL;
5a644f9
 
5a644f9
@@ -399,7 +398,7 @@ preview_set_theme (GtkWidget  *widget,
5a644f9
 
5a644f9
         preview_clear (widget);
5a644f9
 
5a644f9
-        label = glade_xml_get_widget (xml, "fullscreen_preview_theme_label");
5a644f9
+        label = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_theme_label"));
5a644f9
         markup = g_markup_printf_escaped ("%s", name);
5a644f9
         gtk_label_set_markup (GTK_LABEL (label), markup);
5a644f9
         g_free (markup);
5a644f9
@@ -825,7 +824,7 @@ reload_themes (void)
5a644f9
         GtkWidget    *treeview;
5a644f9
         GtkTreeModel *model;
5a644f9
 
5a644f9
-        treeview = glade_xml_get_widget (xml, "savers_treeview");
5a644f9
+        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
5a644f9
         model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
5a644f9
         gtk_tree_store_clear (GTK_TREE_STORE (model));
5a644f9
         populate_model (GTK_TREE_STORE (model));
5a644f9
@@ -960,7 +959,7 @@ drag_data_received_cb (GtkWidget        *widget,
5a644f9
         if (files != NULL) {
5a644f9
                 GtkWidget *prefs_dialog;
5a644f9
 
5a644f9
-                prefs_dialog = glade_xml_get_widget (xml, "prefs_dialog");
5a644f9
+                prefs_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
5a644f9
                 theme_installer_run (prefs_dialog, files);
5a644f9
         }
5a644f9
 }
5a644f9
@@ -1052,7 +1051,7 @@ ui_disable_lock (gboolean disable)
5a644f9
 {
5a644f9
         GtkWidget *widget;
5a644f9
 
5a644f9
-        widget = glade_xml_get_widget (xml, "lock_checkbox");
5a644f9
+        widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
5a644f9
         gtk_widget_set_sensitive (widget, !disable);
5a644f9
         if (disable) {
5a644f9
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
5a644f9
@@ -1066,7 +1065,7 @@ ui_set_lock (gboolean enabled)
5a644f9
         gboolean   active;
5a644f9
         gboolean   lock_disabled;
5a644f9
 
5a644f9
-        widget = glade_xml_get_widget (xml, "lock_checkbox");
5a644f9
+        widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
5a644f9
 
5a644f9
         active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
5a644f9
         if (active != enabled) {
5a644f9
@@ -1084,13 +1083,13 @@ ui_set_enabled (gboolean enabled)
5a644f9
         gboolean   is_writable;
5a644f9
         gboolean   lock_disabled;
5a644f9
 
5a644f9
-        widget = glade_xml_get_widget (xml, "enable_checkbox");
5a644f9
+        widget = GTK_WIDGET (gtk_builder_get_object (builder, "enable_checkbox"));
5a644f9
         active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
5a644f9
         if (active != enabled) {
5a644f9
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), enabled);
5a644f9
         }
5a644f9
 
5a644f9
-        widget = glade_xml_get_widget (xml, "lock_checkbox");
5a644f9
+        widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
5a644f9
         config_get_lock (&is_writable);
5a644f9
         if (is_writable) {
5a644f9
                 gtk_widget_set_sensitive (widget, enabled);
5a644f9
@@ -1104,7 +1103,7 @@ ui_set_delay (int delay)
5a644f9
 {
5a644f9
         GtkWidget *widget;
5a644f9
 
5a644f9
-        widget = glade_xml_get_widget (xml, "activate_delay_hscale");
5a644f9
+        widget = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hscale"));
5a644f9
         gtk_range_set_value (GTK_RANGE (widget), delay);
5a644f9
 }
5a644f9
 
5a644f9
@@ -1159,7 +1158,7 @@ key_changed_cb (GConfClient *client,
5a644f9
                 if (value->type == GCONF_VALUE_LIST) {
5a644f9
                         GtkWidget *treeview;
5a644f9
 
5a644f9
-                        treeview = glade_xml_get_widget (xml, "savers_treeview");
5a644f9
+                        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
5a644f9
                         setup_treeview_selection (treeview);
5a644f9
                 } else {
5a644f9
                         invalid_type_warning (key);
5a644f9
@@ -1187,7 +1186,7 @@ fullscreen_preview_previous_cb (GtkWidget *fullscreen_preview_window,
5a644f9
         GtkWidget        *treeview;
5a644f9
         GtkTreeSelection *selection;
5a644f9
 
5a644f9
-        treeview = glade_xml_get_widget (xml, "savers_treeview");
5a644f9
+        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
5a644f9
         selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
5a644f9
         tree_selection_previous (selection);
5a644f9
 }
5a644f9
@@ -1199,7 +1198,7 @@ fullscreen_preview_next_cb (GtkWidget *fullscreen_preview_window,
5a644f9
         GtkWidget        *treeview;
5a644f9
         GtkTreeSelection *selection;
5a644f9
 
5a644f9
-        treeview = glade_xml_get_widget (xml, "savers_treeview");
5a644f9
+        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
5a644f9
         selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
5a644f9
         tree_selection_next (selection);
5a644f9
 }
5a644f9
@@ -1214,16 +1213,16 @@ fullscreen_preview_cancelled_cb (GtkWidget *button,
5a644f9
         GtkWidget *preview_area;
5a644f9
         GtkWidget *dialog;
5a644f9
 
5a644f9
-        preview_area = glade_xml_get_widget (xml, "preview_area");
5a644f9
+        preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
5a644f9
         gs_job_set_widget (job, preview_area);
5a644f9
 
5a644f9
-        fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
5a644f9
+        fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
5a644f9
         preview_clear (fullscreen_preview_area);
5a644f9
 
5a644f9
-        fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
5a644f9
+        fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
5a644f9
         gtk_widget_hide (fullscreen_preview_window);
5a644f9
 
5a644f9
-        dialog = glade_xml_get_widget (xml, "prefs_dialog");
5a644f9
+        dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
5a644f9
         gtk_widget_show (dialog);
5a644f9
         gtk_window_present (GTK_WINDOW (dialog));
5a644f9
 }
5a644f9
@@ -1236,10 +1235,10 @@ fullscreen_preview_start_cb (GtkWidget *widget,
5a644f9
         GtkWidget *fullscreen_preview_window;
5a644f9
         GtkWidget *dialog;
5a644f9
 
5a644f9
-        dialog = glade_xml_get_widget (xml, "prefs_dialog");
5a644f9
+        dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
5a644f9
         gtk_widget_hide (dialog);
5a644f9
 
5a644f9
-        fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
5a644f9
+        fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
5a644f9
 
5a644f9
         gtk_window_fullscreen (GTK_WINDOW (fullscreen_preview_window));
5a644f9
         gtk_window_set_keep_above (GTK_WINDOW (fullscreen_preview_window), TRUE);
5a644f9
@@ -1247,7 +1246,7 @@ fullscreen_preview_start_cb (GtkWidget *widget,
5a644f9
         gtk_widget_show (fullscreen_preview_window);
5a644f9
         gtk_widget_grab_focus (fullscreen_preview_window);
5a644f9
 
5a644f9
-        fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
5a644f9
+        fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
5a644f9
         preview_clear (fullscreen_preview_area);
5a644f9
         gs_job_set_widget (job, fullscreen_preview_area);
5a644f9
 }
5a644f9
@@ -1308,8 +1307,8 @@ setup_for_root_user (void)
5a644f9
         GtkWidget *lock_checkbox;
5a644f9
         GtkWidget *label;
5a644f9
 
5a644f9
-        lock_checkbox = glade_xml_get_widget (xml, "lock_checkbox");
5a644f9
-        label = glade_xml_get_widget (xml, "root_warning_label");
5a644f9
+        lock_checkbox = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
5a644f9
+        label = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_label"));
5a644f9
 
5a644f9
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lock_checkbox), FALSE);
5a644f9
         gtk_widget_set_sensitive (lock_checkbox, FALSE);
5a644f9
@@ -1403,8 +1402,8 @@ setup_treeview_idle (gpointer data)
5a644f9
         GtkWidget *preview;
5a644f9
         GtkWidget *treeview;
5a644f9
 
5a644f9
-        preview  = glade_xml_get_widget (xml, "preview_area");
5a644f9
-        treeview = glade_xml_get_widget (xml, "savers_treeview");
5a644f9
+        preview  = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
5a644f9
+        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
5a644f9
 
5a644f9
         setup_treeview (treeview, preview);
5a644f9
         setup_treeview_selection (treeview);
5a644f9
@@ -1444,18 +1443,23 @@ init_capplet (void)
5a644f9
         GtkWidget *fullscreen_preview_next;
5a644f9
         GtkWidget *fullscreen_preview_area;
5a644f9
         GtkWidget *fullscreen_preview_close;
5a644f9
-        char      *glade_file;
5a644f9
+        char      *gtk_builder_file;
5a644f9
         char      *string;
5a644f9
         gdouble    activate_delay;
5a644f9
         gboolean   enabled;
5a644f9
         gboolean   is_writable;
5a644f9
         GConfClient *client;
5a644f9
+        GError    *error=NULL;
5a644f9
 
5a644f9
-        glade_file = g_build_filename (GLADEDIR, GLADE_XML_FILE, NULL);
5a644f9
-        xml = glade_xml_new (glade_file, NULL, PACKAGE);
5a644f9
-        g_free (glade_file);
5a644f9
+        gtk_builder_file = g_build_filename (GTKBUILDERDIR, GTK_BUILDER_FILE, NULL);
5a644f9
+        builder = gtk_builder_new();
5a644f9
+        if (!gtk_builder_add_from_file(builder, gtk_builder_file, &error)) {
5a644f9
+                g_warning("Couldn't load builder file: %s", error->message);
5a644f9
+                g_error_free(error);
5a644f9
+        }
5a644f9
+        g_free (gtk_builder_file);
5a644f9
 
5a644f9
-        if (xml == NULL) {
5a644f9
+        if (builder == NULL) {
5a644f9
 
5a644f9
                 dialog = gtk_message_dialog_new (NULL,
5a644f9
                                                  0, GTK_MESSAGE_ERROR,
5a644f9
@@ -1471,26 +1475,26 @@ init_capplet (void)
5a644f9
                 exit (1);
5a644f9
         }
5a644f9
 
5a644f9
-        preview            = glade_xml_get_widget (xml, "preview_area");
5a644f9
-        dialog             = glade_xml_get_widget (xml, "prefs_dialog");
5a644f9
-        treeview           = glade_xml_get_widget (xml, "savers_treeview");
5a644f9
-        list_scroller      = glade_xml_get_widget (xml, "themes_scrolled_window");
5a644f9
-        activate_delay_hscale = glade_xml_get_widget (xml, "activate_delay_hscale");
5a644f9
-        activate_delay_hbox   = glade_xml_get_widget (xml, "activate_delay_hbox");
5a644f9
-        enabled_checkbox   = glade_xml_get_widget (xml, "enable_checkbox");
5a644f9
-        lock_checkbox      = glade_xml_get_widget (xml, "lock_checkbox");
5a644f9
-        root_warning_label = glade_xml_get_widget (xml, "root_warning_label");
5a644f9
-        preview_button     = glade_xml_get_widget (xml, "preview_button");
5a644f9
-        gpm_button         = glade_xml_get_widget (xml, "gpm_button");
5a644f9
-        fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
5a644f9
-        fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
5a644f9
-        fullscreen_preview_close = glade_xml_get_widget (xml, "fullscreen_preview_close");
5a644f9
-        fullscreen_preview_previous = glade_xml_get_widget (xml, "fullscreen_preview_previous_button");
5a644f9
-        fullscreen_preview_next = glade_xml_get_widget (xml, "fullscreen_preview_next_button");
5a644f9
-
5a644f9
-        label              = glade_xml_get_widget (xml, "activate_delay_label");
5a644f9
+        preview            = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
5a644f9
+        dialog             = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
5a644f9
+        treeview           = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
5a644f9
+        list_scroller      = GTK_WIDGET (gtk_builder_get_object (builder, "themes_scrolled_window"));
5a644f9
+        activate_delay_hscale = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hscale"));
5a644f9
+        activate_delay_hbox   = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hbox"));
5a644f9
+        enabled_checkbox   = GTK_WIDGET (gtk_builder_get_object (builder, "enable_checkbox"));
5a644f9
+        lock_checkbox      = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
5a644f9
+        root_warning_label = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_label"));
5a644f9
+        preview_button     = GTK_WIDGET (gtk_builder_get_object (builder, "preview_button"));
5a644f9
+        gpm_button         = GTK_WIDGET (gtk_builder_get_object (builder, "gpm_button"));
5a644f9
+        fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
5a644f9
+        fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
5a644f9
+        fullscreen_preview_close = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_close"));
5a644f9
+        fullscreen_preview_previous = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_previous_button"));
5a644f9
+        fullscreen_preview_next = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_next_button"));
5a644f9
+
5a644f9
+        label              = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_label"));
5a644f9
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), activate_delay_hscale);
5a644f9
-        label              = glade_xml_get_widget (xml, "savers_label");
5a644f9
+        label              = GTK_WIDGET (gtk_builder_get_object (builder, "savers_label"));
5a644f9
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), treeview);
5a644f9
 
5a644f9
         gtk_widget_set_no_show_all (root_warning_label, TRUE);
5a644f9
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
5a644f9
index 0b36a7c..bdb68ae 100644
5a644f9
--- a/src/gs-lock-plug.c
5a644f9
+++ b/src/gs-lock-plug.c
5a644f9
@@ -37,7 +37,6 @@
5a644f9
 #include <gdk/gdkx.h>
5a644f9
 #include <X11/XKBlib.h>
5a644f9
 #include <gtk/gtk.h>
5a644f9
-#include <glade/glade-xml.h>
5a644f9
 #include <gconf/gconf-client.h>
5a644f9
 
5a644f9
 #ifdef WITH_KBD_LAYOUT_INDICATOR
5a644f9
@@ -1627,21 +1626,22 @@ load_theme (GSLockPlug *plug)
5a644f9
 {
5a644f9
         char       *theme;
5a644f9
         char       *filename;
5a644f9
-        char       *glade;
5a644f9
+        char       *gtkbuilder;
5a644f9
         char       *rc;
5a644f9
-        GladeXML   *xml;
5a644f9
+        GtkBuilder *builder;
5a644f9
         GtkWidget  *lock_dialog;
5a644f9
+        GError     *error=NULL;
5a644f9
 
5a644f9
         theme = get_dialog_theme_name (plug);
5a644f9
         if (theme == NULL) {
5a644f9
                 return FALSE;
5a644f9
         }
5a644f9
 
5a644f9
-        filename = g_strdup_printf ("lock-dialog-%s.glade", theme);
5a644f9
-        glade = g_build_filename (GLADEDIR, filename, NULL);
5a644f9
+        filename = g_strdup_printf ("lock-dialog-%s.ui", theme);
5a644f9
+        gtkbuilder = g_build_filename (GTKBUILDERDIR, filename, NULL);
5a644f9
         g_free (filename);
5a644f9
-        if (! g_file_test (glade, G_FILE_TEST_IS_REGULAR)) {
5a644f9
-                g_free (glade);
5a644f9
+        if (! g_file_test (gtkbuilder, G_FILE_TEST_IS_REGULAR)) {
5a644f9
+                g_free (gtkbuilder);
5a644f9
                 g_free (theme);
5a644f9
                 return FALSE;
5a644f9
         }
5a644f9
@@ -1649,50 +1649,51 @@ load_theme (GSLockPlug *plug)
5a644f9
         filename = g_strdup_printf ("lock-dialog-%s.gtkrc", theme);
5a644f9
         g_free (theme);
5a644f9
 
5a644f9
-        rc = g_build_filename (GLADEDIR, filename, NULL);
5a644f9
+        rc = g_build_filename (GTKBUILDERDIR, filename, NULL);
5a644f9
         g_free (filename);
5a644f9
         if (g_file_test (rc, G_FILE_TEST_IS_REGULAR)) {
5a644f9
                 gtk_rc_parse (rc);
5a644f9
         }
5a644f9
         g_free (rc);
5a644f9
 
5a644f9
-        xml = glade_xml_new (glade, "lock-dialog", NULL);
5a644f9
+        builder = gtk_builder_new();
5a644f9
 
5a644f9
-        if (xml == NULL) {
5a644f9
-                g_warning ("Failed to load '%s'\n", glade);
5a644f9
-                g_free (glade);
5a644f9
+        if (!gtk_builder_add_from_file (builder,filename ,&error)) {
5a644f9
+                g_warning ("Couldn't load builder file: %s", error->message);
5a644f9
+                g_error_free(error);
5a644f9
+                g_free (gtkbuilder);
5a644f9
                 return FALSE;
5a644f9
         }
5a644f9
-        g_free (glade);
5a644f9
+        g_free (gtkbuilder);
5a644f9
 
5a644f9
-        lock_dialog = glade_xml_get_widget (xml, "lock-dialog");
5a644f9
+        lock_dialog = GTK_WIDGET (gtk_builder_get_object(builder, "lock-dialog"));
5a644f9
         gtk_container_add (GTK_CONTAINER (plug), lock_dialog);
5a644f9
 
5a644f9
         plug->priv->vbox = NULL;
5a644f9
-        plug->priv->notebook = glade_xml_get_widget (xml, "notebook");
5a644f9
-
5a644f9
-        plug->priv->auth_face_image = glade_xml_get_widget (xml, "auth-face-image");
5a644f9
-        plug->priv->auth_action_area = glade_xml_get_widget (xml, "auth-action-area");
5a644f9
-        plug->priv->auth_realname_label = glade_xml_get_widget (xml, "auth-realname-label");
5a644f9
-        plug->priv->auth_username_label = glade_xml_get_widget (xml, "auth-username-label");
5a644f9
-        plug->priv->auth_prompt_label = glade_xml_get_widget (xml, "auth-prompt-label");
5a644f9
-        plug->priv->auth_prompt_entry = glade_xml_get_widget (xml, "auth-prompt-entry");
5a644f9
-        plug->priv->auth_prompt_box = glade_xml_get_widget (xml, "auth-prompt-box");
5a644f9
-        plug->priv->auth_capslock_label = glade_xml_get_widget (xml, "auth-capslock-label");
5a644f9
-        plug->priv->auth_message_label = glade_xml_get_widget (xml, "auth-status-label");
5a644f9
-        plug->priv->auth_unlock_button = glade_xml_get_widget (xml, "auth-unlock-button");
5a644f9
-        plug->priv->auth_cancel_button = glade_xml_get_widget (xml, "auth-cancel-button");
5a644f9
-        plug->priv->auth_logout_button = glade_xml_get_widget (xml, "auth-logout-button");
5a644f9
-        plug->priv->auth_switch_button = glade_xml_get_widget (xml, "auth-switch-button");
5a644f9
-        plug->priv->auth_note_button = glade_xml_get_widget (xml, "auth-note-button");
5a644f9
-        plug->priv->note_tab = glade_xml_get_widget (xml, "note-tab");
5a644f9
-        plug->priv->note_tab_label = glade_xml_get_widget (xml, "note-tab-label");
5a644f9
-        plug->priv->note_ok_button = glade_xml_get_widget (xml, "note-ok-button");
5a644f9
-        plug->priv->note_text_view = glade_xml_get_widget (xml, "note-text-view");
5a644f9
-        plug->priv->note_cancel_button = glade_xml_get_widget (xml, "note-cancel-button");
5a644f9
+        plug->priv->notebook = GTK_WIDGET (gtk_builder_get_object(builder, "notebook"));
5a644f9
+
5a644f9
+        plug->priv->auth_face_image = GTK_WIDGET (gtk_builder_get_object(builder, "auth-face-image"));
5a644f9
+        plug->priv->auth_action_area = GTK_WIDGET (gtk_builder_get_object(builder, "auth-action-area"));
5a644f9
+        plug->priv->auth_realname_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-realname-label"));
5a644f9
+        plug->priv->auth_username_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-username-label"));
5a644f9
+        plug->priv->auth_prompt_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-label"));
5a644f9
+        plug->priv->auth_prompt_entry = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-entry"));
5a644f9
+        plug->priv->auth_prompt_box = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-box"));
5a644f9
+        plug->priv->auth_capslock_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-capslock-label"));
5a644f9
+        plug->priv->auth_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-status-label"));
5a644f9
+        plug->priv->auth_unlock_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-unlock-button"));
5a644f9
+        plug->priv->auth_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-cancel-button"));
5a644f9
+        plug->priv->auth_logout_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-logout-button"));
5a644f9
+        plug->priv->auth_switch_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-switch-button"));
5a644f9
+        plug->priv->auth_note_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-note-button"));
5a644f9
+        plug->priv->note_tab = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab"));
5a644f9
+        plug->priv->note_tab_label = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab-label"));
5a644f9
+        plug->priv->note_ok_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-ok-button"));
5a644f9
+        plug->priv->note_text_view = GTK_WIDGET (gtk_builder_get_object(builder, "note-text-view"));
5a644f9
+        plug->priv->note_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-cancel-button"));
5a644f9
 
5a644f9
         /* Placeholder for the keyboard indicator */
5a644f9
-        plug->priv->auth_prompt_kbd_layout_indicator = glade_xml_get_widget (xml, "auth-prompt-kbd-layout-indicator");
5a644f9
+        plug->priv->auth_prompt_kbd_layout_indicator = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-kbd-layout-indicator"));
5a644f9
         if (plug->priv->auth_logout_button != NULL) {
5a644f9
                 gtk_widget_set_no_show_all (plug->priv->auth_logout_button, TRUE);
5a644f9
         }
5a644f9
@@ -1705,7 +1706,7 @@ load_theme (GSLockPlug *plug)
5a644f9
 
5a644f9
         gtk_widget_show_all (lock_dialog);
5a644f9
 
5a644f9
-        plug->priv->status_message_label = glade_xml_get_widget (xml, "status-message-label");
5a644f9
+        plug->priv->status_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "status-message-label"));
5a644f9
 
5a644f9
         return TRUE;
5a644f9
 }