upstream/oracle/spec-files: changeset 14836:bc662659c4ff

--- a/ChangeLog	Wed Dec 31 08:04:35 2008 +0000
+++ b/ChangeLog	Fri Jan 02 14:01:43 2009 +0000
@@ -1,3 +1,13 @@
+2009-01-02  Padraig O'Briain  <[email protected]>
+
+	* patches/nautilus-07-lockdown.diff:
+	* patches/nautilus-09-trusted-extensions.diff:
+	* patches/nautilus-10-star-desktop.diff:
+	* patches/nautilus-13-zfs-snapshot.diff:
+	* patches/nautilus-14-interface-changes.diff:
+	* patches/nautilus-14-interface-changes-indiana.diff:
+	  Update patches so that they apply to nautilus 2.25.2.
+
 2008-12-31  Brian Lu  <[email protected]>
 
 	* base-specs/thunderbird.spec:

--- a/patches/nautilus-07-lockdown.diff	Wed Dec 31 08:04:35 2008 +0000
+++ b/patches/nautilus-07-lockdown.diff	Fri Jan 02 14:01:43 2009 +0000
@@ -640,9 +640,9 @@
  	g_free (view->details);
  
  	G_OBJECT_CLASS (parent_class)->finalize (object);
---- nautilus-2.24.0.old/src/nautilus-main.c	2008-09-24 22:16:40.589607000 +0100
-+++ nautilus-2.24.0/src/nautilus-main.c	2008-09-24 22:19:50.641851000 +0100
-@@ -51,6 +51,7 @@
+--- /usr/tmp/nautilus-2.25.2/src/nautilus-main.c	2008-12-01 11:08:00.000000000 +0000
++++ nautilus-2.25.2/src/nautilus-main.c	2009-01-02 09:17:43.908580000 +0000
+@@ -48,6 +48,7 @@
  #include <libnautilus-private/nautilus-debug-log.h>
  #include <libnautilus-private/nautilus-directory-metafile.h>
  #include <libnautilus-private/nautilus-global-preferences.h>
@@ -650,24 +650,22 @@
  #include <libnautilus-private/nautilus-lib-self-check-functions.h>
  #include <libnautilus-private/nautilus-icon-names.h>
  #include <libxml/parser.h>
-@@ -558,6 +559,8 @@
- 		/* we were restarted by the session manager. Don't show default window */
- 		no_default_window = TRUE;
- 	}
-+
-+    nautilus_lockdown_init ();
- 	
- 	bonobo_activate (); /* do now since we need it before main loop */
- 
-@@ -602,6 +605,8 @@
- 		bonobo_object_unref (application);
+@@ -447,6 +448,7 @@
+ 			(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
  	}
  
-+    nautilus_lockdown_finalize ();
-+
++	nautilus_lockdown_init ();
+ 	application = NULL;
+ 
+ 	/* Do either the self-check or the real work. */
+@@ -508,6 +510,7 @@
+ 		g_object_unref (application);
+ 	}
+ 
++	nautilus_lockdown_finalize ();
   	eel_debug_shut_down ();
  	
- 	/* If told to restart, exec() myself again. This is used when
+ 	return EXIT_SUCCESS;
 diff -urN naut.orig/src/nautilus-window-menus.c naut.new/src/nautilus-window-menus.c
 --- naut.orig/src/nautilus-window-menus.c	2008-08-21 00:30:56.182989000 +0100
 +++ naut.new/src/nautilus-window-menus.c	2008-08-21 00:32:23.813862000 +0100

--- a/patches/nautilus-09-trusted-extensions.diff	Wed Dec 31 08:04:35 2008 +0000
+++ b/patches/nautilus-09-trusted-extensions.diff	Fri Jan 02 14:01:43 2009 +0000
@@ -428,11 +428,10 @@
  	
  	g_object_ref (view);
  	gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)),
-diff -urN -x '*.orig' -x '*.rej' naut.orig/src/file-manager/fm-properties-window.c naut.new/src/file-manager/fm-properties-window.c
---- naut.orig/src/file-manager/fm-properties-window.c	2008-07-24 04:04:32.073835000 +0100
-+++ naut.new/src/file-manager/fm-properties-window.c	2008-07-24 04:04:45.193819000 +0100
+--- /usr/tmp/nautilus-2.25.2/src/file-manager/fm-properties-window.c	2008-10-07 20:38:18.000000000 +0100
++++ nautilus-2.25.2/src/file-manager/fm-properties-window.c	2009-01-02 09:24:26.558807000 +0000
 @@ -62,6 +62,8 @@
- #include <string.h>
+ #include <sys/stat.h>
  #include <cairo.h>
  
 +#include <libnautilus-private/nautilus-tsol-extensions.h>
@@ -440,7 +439,7 @@
  #if HAVE_SYS_STATVFS_H
  #include <sys/statvfs.h>
  #endif
-@@ -4747,7 +4749,9 @@
+@@ -4786,7 +4788,9 @@
  {
  	GtkWidget *vbox, *button, *hbox;
  	GtkTable *page_table;
@@ -450,7 +449,7 @@
  	GList *file_list;
  	guint last_row;
  
-@@ -4793,6 +4797,17 @@
+@@ -4832,6 +4836,17 @@
  			 "selinux_context", INCONSISTENT_STATE_STRING,
  			 FALSE);
  #endif
@@ -468,20 +467,19 @@
  		append_title_value_pair
  			(window, page_table, _("Last changed:"), 
  			 "date_permissions", INCONSISTENT_STATE_STRING,
-diff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-application.c naut.new/src/nautilus-application.c
---- naut.orig/src/nautilus-application.c	2008-07-24 04:04:31.879813000 +0100
-+++ naut.new/src/nautilus-application.c	2008-07-24 04:04:45.605444000 +0100
-@@ -91,6 +91,9 @@
+--- /usr/tmp/nautilus-2.25.2/src/nautilus-application.c	2008-12-15 15:54:24.000000000 +0000
++++ nautilus-2.25.2/src/nautilus-application.c	2009-01-02 09:28:46.538240000 +0000
+@@ -88,6 +88,9 @@
  #include <gdk/gdkx.h>
  #include <X11/Xlib.h>
  
 +#include <zone.h>
 +#include <unistd.h>
 +
- #define FACTORY_IID	     "OAFIID:Nautilus_Factory"
- #define SEARCH_LIST_VIEW_IID "OAFIID:Nautilus_File_Manager_Search_List_View"
- #define SHELL_IID	     "OAFIID:Nautilus_Shell"
-@@ -739,12 +742,12 @@
+ /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
+ #define APPLICATION_WINDOW_MIN_WIDTH	300
+ #define APPLICATION_WINDOW_MIN_HEIGHT	100
+@@ -707,12 +710,12 @@
  static GtkWidget *
  get_desktop_manager_selection (GdkDisplay *display, int screen)
  {
@@ -496,13 +494,12 @@
  	selection_atom = gdk_atom_intern (selection_name, FALSE);
  
  	selection_owner = XGetSelectionOwner (GDK_DISPLAY_XDISPLAY (display),
-diff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-desktop-window.c naut.new/src/nautilus-desktop-window.c
---- naut.orig/src/nautilus-desktop-window.c	2008-07-24 04:04:31.887906000 +0100
-+++ naut.new/src/nautilus-desktop-window.c	2008-07-24 04:04:45.610135000 +0100
+--- /usr/tmp/nautilus-2.25.2/src/nautilus-desktop-window.c	2008-10-06 10:54:32.000000000 +0100
++++ nautilus-2.25.2/src/nautilus-desktop-window.c	2009-01-02 09:32:49.333749000 +0000
 @@ -36,6 +36,10 @@
- #include <libnautilus-private/nautilus-file-utilities.h>
  #include <libnautilus-private/nautilus-icon-names.h>
  #include <gio/gio.h>
+ #include <glib/gi18n.h>
 +#include <libnautilus-private/nautilus-tsol-extensions.h>
 +
 +#include <strings.h>

--- a/patches/nautilus-10-star-desktop.diff	Wed Dec 31 08:04:35 2008 +0000
+++ b/patches/nautilus-10-star-desktop.diff	Fri Jan 02 14:01:43 2009 +0000
@@ -1,47 +1,46 @@
---- /usr/tmp/clean/nautilus-2.20.0/src/nautilus-application.c	2007-09-10 07:56:43.000000000 +0100
-+++ nautilus-2.20.0/src/nautilus-application.c	2007-11-23 09:51:37.396201000 +0000
-@@ -421,6 +421,35 @@
+--- /usr/tmp/nautilus-2.25.2/src/nautilus-application.c	2008-12-15 15:54:24.000000000 +0000
++++ nautilus-2.25.2/src/nautilus-application.c	2009-01-02 09:43:12.852217000 +0000
+@@ -546,6 +549,35 @@
  }
  
  static void
 +check_star_icon (void)
 +{
-+	char *desktop_file;
-+	char *system_file;
-+	char *desktop_path;
-+	struct stat desktop_buf;
++       char *desktop_file;
++       char *system_file;
++       char *desktop_path;
++       struct stat desktop_buf;
 +
-+	desktop_path = nautilus_get_desktop_directory ();
-+	desktop_file = g_build_filename (desktop_path,
-+				 	 "star.desktop",
-+					 NULL);
-+	if (g_stat (desktop_file, &desktop_buf) == 0) {
-+		struct stat system_buf;
-+		system_file = g_build_filename (DATADIR "/applications",
-+					        "star.desktop",
-+						NULL);
-+		if (g_stat (system_file, &system_buf) == 0) {
-+			if (desktop_buf.st_size != system_buf.st_size) {
-+				g_unlink(desktop_file);
-+			}
-+		}
-+		g_free (system_file);
-+	}
++       desktop_path = nautilus_get_desktop_directory ();
++       desktop_file = g_build_filename (desktop_path,
++                                        "star.desktop",
++                                        NULL);
++       if (g_stat (desktop_file, &desktop_buf) == 0) {
++               struct stat system_buf;
++               system_file = g_build_filename (DATADIR "/applications",
++                                               "star.desktop",
++                                               NULL);
++               if (g_stat (system_file, &system_buf) == 0) {
++                       if (desktop_buf.st_size != system_buf.st_size) {
++                               g_unlink(desktop_file);
++                       }
++               }
++               g_free (system_file);
++       }
 +
-+	g_free (desktop_file);
-+	g_free (desktop_path);
++       g_free (desktop_file);
++       g_free (desktop_path);
 +}
 +
 +static void
- initialize_kde_trash_hack (void)
- {
- 	char *trash_dir;
-@@ -524,6 +553,8 @@
+ open_windows (NautilusApplication *application,
+ 	      const char *startup_id,
+ 	      char **uris,
+@@ -629,6 +661,7 @@
  		return;
  	}
  
-+	check_star_icon();
-+ 
- 	initialize_kde_trash_hack ();
- 
- 	CORBA_exception_init (&ev);
++	check_star_icon ();
+ 	if (kill_shell) {
+ 		if (unique_app_is_running (application->unique_app)) {
+ 			unique_app_send_message (application->unique_app,

--- a/patches/nautilus-13-zfs-snapshot.diff	Wed Dec 31 08:04:35 2008 +0000
+++ b/patches/nautilus-13-zfs-snapshot.diff	Fri Jan 02 14:01:43 2009 +0000
@@ -37,11 +37,10 @@
  	$(NULL)
  
  EXTRA_DIST = $(icon_DATA)
-diff -x '*.out' -x '*.*~' -x '*.orig' -x '*.rej' -rupN nautilus-2.24.2/libnautilus-private/Makefile.am ../nautilus-full-async/libnautilus-private/Makefile.am
---- nautilus-2.24.2/libnautilus-private/Makefile.am	2008-12-02 14:18:12.736628060 +0100
-+++ ../nautilus-full-async/libnautilus-private/Makefile.am	2008-12-02 10:31:48.238310426 +0100
-@@ -32,6 +32,7 @@ libnautilus_private_la_LIBADD =		\
- 	$(TRACKER_LIBS)			\
+--- /usr/tmp/nautilus-2.25.2/libnautilus-private/Makefile.am	2008-12-15 15:08:51.000000000 +0000
++++ nautilus-2.25.2/libnautilus-private/Makefile.am	2009-01-02 10:37:01.721349000 +0000
+@@ -33,6 +33,7 @@
+ 	$(top_builddir)/eel/libeel-2.la \
  	$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
  	$(CORE_LIBS)			\
 +	$(ZFS_LIBS)			\
@@ -2008,10 +2007,9 @@
  #define NAUTILUS_ACTION_BACK "Back"
  #define NAUTILUS_ACTION_UP "Up"
  #define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
-diff -x '*.out' -x '*.*~' -x '*.orig' -x '*.rej' -rupN nautilus-2.24.2/src/nautilus-file-management-properties.c ../nautilus-full-async/src/nautilus-file-management-properties.c
---- nautilus-2.24.2/src/nautilus-file-management-properties.c	2008-10-06 19:22:18.000000000 +0200
-+++ ../nautilus-full-async/src/nautilus-file-management-properties.c	2008-12-02 10:32:08.144766887 +0100
-@@ -73,6 +73,7 @@
+--- /usr/tmp/nautilus-2.25.2/src/nautilus-file-management-properties.c	2008-12-10 10:20:22.000000000 +0000
++++ nautilus-2.25.2/src/nautilus-file-management-properties.c	2009-01-02 09:56:19.673238000 +0000
+@@ -70,6 +70,7 @@
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton"
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTOMOUNT_OPEN "media_automount_open_checkbutton"
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTORUN_NEVER "media_autorun_never_checkbutton"
@@ -2019,4264 +2017,2367 @@
  
  /* int enums */
  #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
-@@ -725,6 +726,9 @@ nautilus_file_management_properties_dial
- 	eel_preferences_glade_connect_bool (xml_dialog,
- 					    NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET,
- 					    NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
-+	eel_preferences_glade_connect_bool (xml_dialog,
-+					    NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ENABLE_TIME_SLIDER,
-+					    NAUTILUS_PREFERENCES_ENABLE_TIME_SLIDER);
- 
- 	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
- 							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
-diff -x '*.out' -x '*.*~' -x '*.orig' -x '*.rej' -rupN nautilus-2.24.2/src/nautilus-file-management-properties.glade ../nautilus-full-async/src/nautilus-file-management-properties.glade
---- nautilus-2.24.2/src/nautilus-file-management-properties.glade	2008-10-06 19:22:18.000000000 +0200
-+++ ../nautilus-full-async/src/nautilus-file-management-properties.glade	2008-12-02 10:32:07.715393873 +0100
-@@ -1,2041 +1,1167 @@
--<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
--<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
--
-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-+<!--*- mode: xml -*-->
- <glade-interface>
--
--<widget class="GtkDialog" id="file_management_dialog">
--  <property name="border_width">5</property>
--  <property name="title" translatable="yes">File Management Preferences</property>
--  <property name="type">GTK_WINDOW_TOPLEVEL</property>
--  <property name="window_position">GTK_WIN_POS_CENTER</property>
--  <property name="modal">False</property>
--  <property name="resizable">True</property>
--  <property name="destroy_with_parent">False</property>
--  <property name="decorated">True</property>
--  <property name="skip_taskbar_hint">False</property>
--  <property name="skip_pager_hint">False</property>
--  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
--  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
--  <property name="focus_on_map">True</property>
--  <property name="urgency_hint">False</property>
--  <property name="has_separator">False</property>
--
--  <child internal-child="vbox">
--    <widget class="GtkVBox" id="dialog-vbox1">
--      <property name="visible">True</property>
--      <property name="homogeneous">False</property>
--      <property name="spacing">2</property>
--
--      <child internal-child="action_area">
--	<widget class="GtkHButtonBox" id="dialog-action_area1">
--	  <property name="visible">True</property>
--	  <property name="layout_style">GTK_BUTTONBOX_END</property>
--
--	  <child>
--	    <widget class="GtkButton" id="helpbutton1">
--	      <property name="visible">True</property>
--	      <property name="can_default">True</property>
--	      <property name="can_focus">True</property>
--	      <property name="label">gtk-help</property>
--	      <property name="use_stock">True</property>
--	      <property name="relief">GTK_RELIEF_NORMAL</property>
--	      <property name="focus_on_click">True</property>
--	      <property name="response_id">-11</property>
--	    </widget>
--	  </child>
--
--	  <child>
--	    <widget class="GtkButton" id="closebutton1">
--	      <property name="visible">True</property>
--	      <property name="can_default">True</property>
--	      <property name="can_focus">True</property>
--	      <property name="label">gtk-close</property>
--	      <property name="use_stock">True</property>
--	      <property name="relief">GTK_RELIEF_NORMAL</property>
--	      <property name="focus_on_click">True</property>
--	      <property name="response_id">-7</property>
--	    </widget>
--	  </child>
--	</widget>
--	<packing>
--	  <property name="padding">0</property>
--	  <property name="expand">False</property>
--	  <property name="fill">True</property>
--	  <property name="pack_type">GTK_PACK_END</property>
--	</packing>
--      </child>
--
--      <child>
--	<widget class="GtkNotebook" id="notebook1">
--	  <property name="border_width">5</property>
--	  <property name="visible">True</property>
--	  <property name="can_focus">True</property>
--	  <property name="show_tabs">True</property>
--	  <property name="show_border">True</property>
--	  <property name="tab_pos">GTK_POS_TOP</property>
--	  <property name="scrollable">False</property>
--	  <property name="enable_popup">False</property>
--
--	  <child>
--	    <widget class="GtkVBox" id="vbox1">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">18</property>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox2">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label4">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Default View&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment2">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox14">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox34">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="views_label_0">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">View _new folders using:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">default_view_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="default_view_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">Icon View
-+  <widget class="GtkDialog" id="file_management_dialog">
-+    <property name="border_width">5</property>
-+    <property name="title" translatable="yes">File Management Preferences</property>
-+    <property name="window_position">GTK_WIN_POS_CENTER</property>
-+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+    <property name="has_separator">False</property>
-+    <child internal-child="vbox">
-+      <widget class="GtkVBox" id="dialog-vbox1">
-+        <property name="visible">True</property>
-+        <property name="spacing">2</property>
-+        <child>
-+          <widget class="GtkNotebook" id="notebook1">
-+            <property name="visible">True</property>
-+            <property name="can_focus">True</property>
+@@ -729,6 +730,9 @@
+ 	eel_preferences_builder_connect_bool (builder,
+ 					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET,
+ 					      NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
++	eel_preferences_builder_connect_bool (builder,
++					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ENABLE_TIME_SLIDER,
++					      NAUTILUS_PREFERENCES_ENABLE_TIME_SLIDER);
+ 	
+ 	eel_preferences_builder_connect_string_enum_combo_box (builder,
+ 							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
+--- /usr/tmp/nautilus-2.25.2/src/nautilus-file-management-properties.ui	2008-12-10 10:32:34.000000000 +0000
++++ nautilus-2.25.2/src/nautilus-file-management-properties.ui	2009-01-02 13:41:06.296414000 +0000
+@@ -253,18 +253,8 @@
+   <object class="GtkDialog" id="file_management_dialog">
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">File Management Preferences</property>
+-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+     <property name="window_position">GTK_WIN_POS_CENTER</property>
+-    <property name="modal">False</property>
+-    <property name="resizable">True</property>
+-    <property name="destroy_with_parent">False</property>
+-    <property name="decorated">True</property>
+-    <property name="skip_taskbar_hint">False</property>
+-    <property name="skip_pager_hint">False</property>
+     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-    <property name="focus_on_map">True</property>
+-    <property name="urgency_hint">False</property>
+     <property name="has_separator">False</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox1">
+@@ -272,80 +262,27 @@
+         <property name="homogeneous">False</property>
+         <property name="spacing">2</property>
+         <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area1">
+-            <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+-            <child>
+-              <object class="GtkButton" id="helpbutton1">
+-                <property name="visible">True</property>
+-                <property name="can_default">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="label">gtk-help</property>
+-                <property name="use_stock">True</property>
+-                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                <property name="focus_on_click">True</property>
+-              </object>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="closebutton1">
+-                <property name="visible">True</property>
+-                <property name="can_default">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="label">gtk-close</property>
+-                <property name="use_stock">True</property>
+-                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                <property name="focus_on_click">True</property>
+-              </object>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="padding">0</property>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="pack_type">GTK_PACK_END</property>
+-          </packing>
+-        </child>
+-        <child>
+           <object class="GtkNotebook" id="notebook1">
+-            <property name="border_width">5</property>
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+-            <property name="show_tabs">True</property>
+-            <property name="show_border">True</property>
+-            <property name="tab_pos">GTK_POS_TOP</property>
+-            <property name="scrollable">False</property>
+-            <property name="enable_popup">False</property>
 +            <property name="border_width">5</property>
-+            <child>
-+              <widget class="GtkVBox" id="vbox1">
-+                <property name="visible">True</property>
+             <child>
+               <object class="GtkVBox" id="vbox1">
+-                <property name="border_width">12</property>
+                 <property name="visible">True</property>
+-                <property name="homogeneous">False</property>
 +                <property name="border_width">12</property>
-+                <property name="spacing">18</property>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox2">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label4">
-+                        <property name="visible">True</property>
+                 <property name="spacing">18</property>
+                 <child>
+                   <object class="GtkVBox" id="vbox2">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label4">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Default View&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment2">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox14">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox34">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="views_label_0">
-+                                    <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Default View&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -353,45 +290,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment2">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox14">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox34">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="views_label_0">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">View _new folders using:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">default_view_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="default_view_combobox">
-+                                    <property name="visible">True</property>
+                                     <property name="label" translatable="yes">View _new folders using:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">default_view_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -399,8 +315,9 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="default_view_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
 +                                    <property name="items" translatable="yes">Icon View
- List View
- Compact View</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox11">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="views_label_1">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">_Arrange items:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">sort_order_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="sort_order_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">By Name
-+                                  </widget>
-+                                  <packing>
++List View
++Compact View</property>
+                                     <property name="model">model1</property>
+                                     <child>
+                                       <object class="GtkCellRendererText" id="renderer1"/>
+@@ -410,44 +327,24 @@
+                                     </child>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox11">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="views_label_1">
-+                                    <property name="visible">True</property>
+                                   </packing>
+                                 </child>
+                               </object>
+-                              <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
+-                              </packing>
+                             </child>
+                             <child>
+                               <object class="GtkHBox" id="hbox11">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="views_label_1">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">_Arrange items:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">sort_order_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="sort_order_combobox">
-+                                    <property name="visible">True</property>
+                                     <property name="label" translatable="yes">_Arrange items:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">sort_order_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -455,27 +352,19 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="sort_order_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model2</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer2"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
 +                                    <property name="items" translatable="yes">By Name
- By Size
- By Type
- By Modification Date
- By Emblems</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="sort_folders_first_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Sort _folders before files</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="hidden_files_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Show hidden and _backup files</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox3">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label5">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Icon View Defaults&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment1">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox16">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox35">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="views_label_2">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">Default _zoom level:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">icon_view_zoom_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="icon_view_zoom_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">33%
-+                                  </widget>
-+                                  <packing>
++By Size
++By Type
++By Modification Date
++By Emblems</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                              <packing>
+                                   </packing>
+                                 </child>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
 +                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="sort_folders_first_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">Sort _folders before files</property>
-+                                <property name="use_underline">True</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -484,16 +373,13 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Sort _folders before files</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">2</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="hidden_files_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">Show hidden and _backup files</property>
-+                                <property name="use_underline">True</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -502,59 +388,39 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Show hidden and _backup files</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">3</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox3">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label5">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Icon View Defaults&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment1">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox16">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox35">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="views_label_2">
-+                                    <property name="visible">True</property>
-+                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Default _zoom level:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">icon_view_zoom_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="icon_view_zoom_combobox">
-+                                    <property name="visible">True</property>
-+                                    <property name="items" translatable="yes">33%
- 50%
- 66%
- 100%
- 150%
- 200%
- 400%</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="compact_layout_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Use compact layout</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="labels_beside_icons_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Text beside icons</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Compact View Defaults&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="views_label_4">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">_Default zoom level:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">compact_view_zoom_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="compact_view_zoom_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">33%
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="compact_layout_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_Use compact layout</property>
-+                                <property name="use_underline">True</property>
-+                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="labels_beside_icons_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_Text beside icons</property>
-+                                <property name="use_underline">True</property>
-+                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">2</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label">
-+                        <property name="visible">True</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox3">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label5">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Compact View Defaults&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="views_label_4">
-+                                    <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Icon View Defaults&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -562,45 +428,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment1">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox16">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox35">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="views_label_2">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">_Default zoom level:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">compact_view_zoom_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="compact_view_zoom_combobox">
-+                                    <property name="visible">True</property>
-+                                    <property name="items" translatable="yes">33%
- 50%
- 66%
- 100%
- 150%
- 200%
- 400%</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="all_columns_same_width_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">A_ll columns have the same width</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox4">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label6">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;List View Defaults&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment3">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox15">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox36">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="views_label_3">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">D_efault zoom level:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">list_view_zoom_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="list_view_zoom_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">33%
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="all_columns_same_width_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">A_ll columns have the same width</property>
-+                                <property name="use_underline">True</property>
-+                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox4">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label6">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;List View Defaults&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment3">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox15">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox36">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="views_label_3">
-+                                    <property name="visible">True</property>
-+                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">D_efault zoom level:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">list_view_zoom_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="list_view_zoom_combobox">
-+                                    <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Default _zoom level:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">icon_view_zoom_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -608,27 +453,21 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="icon_view_zoom_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model3</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer3"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
 +                                    <property name="items" translatable="yes">33%
- 50%
- 66%
- 100%
- 150%
- 200%
- 400%</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox24">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label25">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Tree View Defaults&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment4">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox25">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="treeview_folders_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Show _only folders</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="label1">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Views</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkVBox" id="vbox5">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">18</property>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox6">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label10">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment5">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox17">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">0</property>
--
--			  <child>
--			    <widget class="GtkRadioButton" id="single_click_radiobutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Single click to open items</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkRadioButton" id="double_click_radiobutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Double click to open items</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			      <property name="group">single_click_radiobutton</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">6</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkLabel" id="label">
--			      <property name="height_request">6</property>
--			      <property name="visible">True</property>
--			      <property name="label" translatable="yes"></property>
--			      <property name="use_underline">False</property>
--			      <property name="use_markup">False</property>
--			      <property name="justify">GTK_JUSTIFY_LEFT</property>
--			      <property name="wrap">False</property>
--			      <property name="selectable">False</property>
--			      <property name="xalign">0.5</property>
--			      <property name="yalign">0.5</property>
--			      <property name="xpad">0</property>
--			      <property name="ypad">0</property>
--			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--			      <property name="width_chars">-1</property>
--			      <property name="single_line_mode">False</property>
--			      <property name="angle">0</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="always_use_browser_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Always open in _browser windows</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox7">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label12">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Executable Text Files&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment6">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox18">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkRadioButton" id="scripts_execute_radiobutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Run executable text files when they are opened</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkRadioButton" id="scripts_view_radiobutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_View executable text files when they are opened</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			      <property name="group">scripts_execute_radiobutton</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkRadioButton" id="scripts_confirm_radiobutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Ask each time</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			      <property name="group">scripts_execute_radiobutton</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox8">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label14">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Trash&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment7">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox19">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="trash_confirm_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="trash_delete_checkbutton">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="label2">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Behavior</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkVBox" id="vbox26">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">18</property>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox27">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label28">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Icon Captions&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment8">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox28">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkLabel" id="label29">
--			      <property name="visible">True</property>
--			      <property name="label" translatable="yes">Choose the order of information to appear beneath icon names. More information will appear when zooming in closer.</property>
--			      <property name="use_underline">False</property>
--			      <property name="use_markup">False</property>
--			      <property name="justify">GTK_JUSTIFY_LEFT</property>
--			      <property name="wrap">True</property>
--			      <property name="selectable">False</property>
--			      <property name="xalign">0</property>
--			      <property name="yalign">0.5</property>
--			      <property name="xpad">0</property>
--			      <property name="ypad">0</property>
--			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--			      <property name="width_chars">-1</property>
--			      <property name="single_line_mode">False</property>
--			      <property name="angle">0</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox28">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">0</property>
--
--			      <child>
--				<widget class="GtkLabel" id="captions_label_0">
--				  <property name="visible">True</property>
--				  <property name="label"></property>
--				  <property name="use_underline">False</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0.5</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="captions_0_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes"></property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox29">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">0</property>
--
--			      <child>
--				<widget class="GtkLabel" id="captions_label_1">
--				  <property name="visible">True</property>
--				  <property name="label"></property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0.5</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="captions_1_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes"></property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox30">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">0</property>
--
--			      <child>
--				<widget class="GtkLabel" id="captions_label_2">
--				  <property name="visible">True</property>
--				  <property name="label"></property>
--				  <property name="use_underline">False</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0.5</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="captions_2_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes"></property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox31">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label34">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment9">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkHBox" id="hbox33">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">12</property>
--
--			  <child>
--			    <widget class="GtkLabel" id="label36">
--			      <property name="visible">True</property>
--			      <property name="label" translatable="yes">_Format:</property>
--			      <property name="use_underline">True</property>
--			      <property name="use_markup">False</property>
--			      <property name="justify">GTK_JUSTIFY_LEFT</property>
--			      <property name="wrap">False</property>
--			      <property name="selectable">False</property>
--			      <property name="xalign">0.5</property>
--			      <property name="yalign">0.5</property>
--			      <property name="xpad">0</property>
--			      <property name="ypad">0</property>
--			      <property name="mnemonic_widget">date_format_combobox</property>
--			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--			      <property name="width_chars">-1</property>
--			      <property name="single_line_mode">False</property>
--			      <property name="angle">0</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkComboBox" id="date_format_combobox">
--			      <property name="visible">True</property>
--			      <property name="items" translatable="yes"></property>
--			      <property name="add_tearoffs">False</property>
--			      <property name="focus_on_click">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="label24">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Display</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkVBox" id="vbox29">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">18</property>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox30">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label31">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;List Columns&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment21">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="list_columns_vbox">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkLabel" id="label33">
--			      <property name="visible">True</property>
--			      <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
--			      <property name="use_underline">False</property>
--			      <property name="use_markup">False</property>
--			      <property name="justify">GTK_JUSTIFY_LEFT</property>
--			      <property name="wrap">True</property>
--			      <property name="selectable">False</property>
--			      <property name="xalign">0</property>
--			      <property name="yalign">0.5</property>
--			      <property name="xpad">0</property>
--			      <property name="ypad">0</property>
--			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--			      <property name="width_chars">-1</property>
--			      <property name="single_line_mode">False</property>
--			      <property name="angle">0</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <placeholder/>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">True</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="label30">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">List Columns</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkVBox" id="vbox9">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">18</property>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox10">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label16">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Text Files&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment10">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox20">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox24">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="preview_label_0">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">Show te_xt in icons:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">preview_text_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="preview_text_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">Always
-+                                  </widget>
-+                                  <packing>
++50%
++66%
++100%
++150%
++200%
++400%</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
+                                   </packing>
+                                 </child>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -636,17 +475,13 @@
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Use compact layout</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
++                                <property name="response_id">0</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -655,59 +490,39 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Text beside icons</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
++                                <property name="response_id">0</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
++                                <property name="position">2</property>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
++                        <property name="position">1</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
++                    <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Compact View Defaults&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -715,45 +530,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+-                          <object class="GtkVBox" id="vbox42">
++                          <object class="GtkVBox" id="vbox">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="views_label_4">
+                                     <property name="visible">True</property>
++                                    <property name="xalign">0</property>
+                                     <property name="label" translatable="yes">_Default zoom level:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">compact_view_zoom_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -761,28 +555,20 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="compact_view_zoom_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model4</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer4"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
++                                    <property name="items" translatable="yes">33
++%
++50%
++66%
++100%
++150%
++200%
++400%</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                                   </packing>
+                                 </child>
+                               </object>
+-                              <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
+-                              </packing>
+                             </child>
+                             <child>
+                               <object class="GtkCheckButton" id="all_columns_same_width_checkbutton">
+@@ -790,59 +576,39 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">A_ll columns have the same width</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
++                                <property name="response_id">0</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
++                    <property name="position">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox4">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label6">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;List View Defaults&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -850,45 +616,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment3">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox15">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox36">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="views_label_3">
+                                     <property name="visible">True</property>
++                                    <property name="xalign">0</property>
+                                     <property name="label" translatable="yes">D_efault zoom level:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">list_view_zoom_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -896,70 +641,46 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="list_view_zoom_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model5</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer5"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
++                                    <property name="items" translatable="yes">33%
++50%
++66%
++100%
++150%
++200%
++400%</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
+                                   </packing>
+                                 </child>
+                               </object>
+-                              <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
++                        <property name="position">1</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
 +                    <property name="position">3</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox24">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label25">
-+                        <property name="visible">True</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox24">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label25">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Tree View Defaults&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment4">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox25">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="treeview_folders_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">Show _only folders</property>
-+                                <property name="use_underline">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Tree View Defaults&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -967,18 +688,10 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment4">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox25">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkCheckButton" id="treeview_folders_checkbutton">
+@@ -986,14 +699,10 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Show _only folders</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+@@ -1002,74 +711,44 @@
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
 +                    <property name="position">4</property>
-+                  </packing>
-+                </child>
-+              </widget>
-+            </child>
+                   </packing>
+                 </child>
+               </object>
+-              <packing>
+-                <property name="tab_expand">False</property>
+-                <property name="tab_fill">True</property>
+-              </packing>
+             </child>
+-            <child type="tab">
 +            <child>
-+              <widget class="GtkLabel" id="label1">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Views</property>
-+              </widget>
+               <object class="GtkLabel" id="label1">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Views</property>
+-                <property name="use_underline">False</property>
+-                <property name="use_markup">False</property>
+-                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                <property name="wrap">False</property>
+-                <property name="selectable">False</property>
+-                <property name="xalign">0.5</property>
+-                <property name="yalign">0.5</property>
+-                <property name="xpad">0</property>
+-                <property name="ypad">0</property>
+-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                <property name="width_chars">-1</property>
+-                <property name="single_line_mode">False</property>
+-                <property name="angle">0</property>
+               </object>
 +              <packing>
 +                <property name="type">tab</property>
 +                <property name="tab_fill">False</property>
 +              </packing>
-+            </child>
-+            <child>
-+              <widget class="GtkVBox" id="vbox5">
-+                <property name="visible">True</property>
-+                <property name="border_width">12</property>
-+                <property name="spacing">18</property>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox6">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label10">
-+                        <property name="visible">True</property>
+             </child>
+             <child>
+               <object class="GtkVBox" id="vbox5">
+                 <property name="border_width">12</property>
+                 <property name="visible">True</property>
+-                <property name="homogeneous">False</property>
+                 <property name="spacing">18</property>
+                 <child>
+                   <object class="GtkVBox" id="vbox6">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label10">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment5">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox17">
-+                            <property name="visible">True</property>
-+                            <child>
-+                              <widget class="GtkRadioButton" id="single_click_radiobutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_Single click to open items</property>
-+                                <property name="use_underline">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -1077,33 +756,20 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment5">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox17">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+-                            <property name="spacing">0</property>
+                             <child>
+                               <object class="GtkRadioButton" id="single_click_radiobutton">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Single click to open items</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkRadioButton" id="double_click_radiobutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_Double click to open items</property>
-+                                <property name="use_underline">True</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+@@ -1114,42 +780,24 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Double click to open items</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                                <property name="group">single_click_radiobutton</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">single_click_radiobutton</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">6</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="padding">6</property>
 +                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkLabel" id="label2">
-+                                <property name="height_request">6</property>
-+                                <property name="visible">True</property>
-+                              </widget>
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkLabel" id="label">
++                              <object class="GtkLabel" id="label2">
+                                 <property name="height_request">6</property>
+                                 <property name="visible">True</property>
+-                                <property name="label" translatable="yes"/>
+-                                <property name="use_underline">False</property>
+-                                <property name="use_markup">False</property>
+-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                <property name="wrap">False</property>
+-                                <property name="selectable">False</property>
+-                                <property name="xalign">0.5</property>
+-                                <property name="yalign">0.5</property>
+-                                <property name="xpad">0</property>
+-                                <property name="ypad">0</property>
+-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                <property name="width_chars">-1</property>
+-                                <property name="single_line_mode">False</property>
+-                                <property name="angle">0</property>
+-                              </object>
+-                              <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
++                              </object>
 +                              <packing>
 +                                <property name="position">2</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="always_use_browser_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">Always open in _browser windows</property>
-+                                <property name="use_underline">True</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1158,30 +806,24 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Always open in _browser windows</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">3</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox7">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label12">
-+                        <property name="visible">True</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
+                   </packing>
+@@ -1189,28 +831,15 @@
+                 <child>
+                   <object class="GtkVBox" id="vbox7">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label12">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Executable Text Files&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment6">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox18">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkRadioButton" id="scripts_execute_radiobutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_Run executable text files when they are opened</property>
-+                                <property name="use_underline">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Executable Text Files&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -1218,18 +847,10 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment6">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox18">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkRadioButton" id="scripts_execute_radiobutton">
+@@ -1237,14 +858,10 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Run executable text files when they are opened</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkRadioButton" id="scripts_view_radiobutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_View executable text files when they are opened</property>
-+                                <property name="use_underline">True</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+@@ -1255,17 +872,14 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_View executable text files when they are opened</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                                <property name="group">scripts_execute_radiobutton</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">scripts_execute_radiobutton</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkRadioButton" id="scripts_confirm_radiobutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_Ask each time</property>
-+                                <property name="use_underline">True</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1274,60 +888,41 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">_Ask each time</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                                <property name="group">scripts_execute_radiobutton</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">scripts_execute_radiobutton</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">2</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
 +                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox8">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label14">
-+                        <property name="visible">True</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox8">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label14">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Trash&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment7">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox19">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="trash_confirm_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
-+                                <property name="use_underline">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Trash&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -1335,18 +930,10 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment7">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox19">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkCheckButton" id="trash_confirm_checkbutton">
+@@ -1354,14 +941,10 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkCheckButton" id="trash_delete_checkbutton">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
-+                                <property name="use_underline">True</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+@@ -1372,90 +955,60 @@
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="relief">GTK_RELIEF_NORMAL</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="active">False</property>
+-                                <property name="inconsistent">False</property>
 +                                <property name="response_id">0</property>
-+                                <property name="draw_indicator">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+              </widget>
-+              <packing>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+-                    <property name="expand">False</property>
+-                    <property name="fill">True</property>
++                    <property name="position">1</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="tab_expand">False</property>
+-                <property name="tab_fill">True</property>
 +                <property name="position">1</property>
-+              </packing>
-+            </child>
+               </packing>
+             </child>
+-            <child type="tab">
+-              <object class="GtkLabel" id="label2">
 +            <child>
-+              <widget class="GtkLabel" id="label3">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Behavior</property>
-+              </widget>
++              <object class="GtkLabel" id="label3">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Behavior</property>
+-                <property name="use_underline">False</property>
+-                <property name="use_markup">False</property>
+-                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                <property name="wrap">False</property>
+-                <property name="selectable">False</property>
+-                <property name="xalign">0.5</property>
+-                <property name="yalign">0.5</property>
+-                <property name="xpad">0</property>
+-                <property name="ypad">0</property>
+-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                <property name="width_chars">-1</property>
+-                <property name="single_line_mode">False</property>
+-                <property name="angle">0</property>
+               </object>
 +              <packing>
 +                <property name="type">tab</property>
 +                <property name="position">1</property>
 +                <property name="tab_fill">False</property>
 +              </packing>
-+            </child>
-+            <child>
-+              <widget class="GtkVBox" id="vbox26">
-+                <property name="visible">True</property>
-+                <property name="border_width">12</property>
-+                <property name="spacing">18</property>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox27">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label28">
-+                        <property name="visible">True</property>
+             </child>
+             <child>
+               <object class="GtkVBox" id="vbox26">
+                 <property name="border_width">12</property>
+                 <property name="visible">True</property>
+-                <property name="homogeneous">False</property>
+                 <property name="spacing">18</property>
+                 <child>
+                   <object class="GtkVBox" id="vbox27">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label28">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Icon Captions&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment8">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox28">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkLabel" id="label29">
-+                                <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Icon Captions&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -1463,39 +1016,19 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment8">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox28">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkLabel" id="label29">
+                                 <property name="visible">True</property>
 +                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Choose the order of information to appear beneath icon names. More information will appear when zooming in closer.</property>
-+                                <property name="wrap">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox28">
-+                                <property name="visible">True</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="captions_label_0">
-+                                    <property name="visible">True</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="captions_0_combobox">
-+                                    <property name="visible">True</property>
+                                 <property name="label" translatable="yes">Choose the order of information to appear beneath icon names. More information will appear when zooming in closer.</property>
+-                                <property name="use_underline">False</property>
+-                                <property name="use_markup">False</property>
+-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">True</property>
+-                                <property name="selectable">False</property>
+-                                <property name="xalign">0</property>
+-                                <property name="yalign">0.5</property>
+-                                <property name="xpad">0</property>
+-                                <property name="ypad">0</property>
+-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                <property name="width_chars">-1</property>
+-                                <property name="single_line_mode">False</property>
+-                                <property name="angle">0</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+@@ -1503,28 +1036,11 @@
+                             <child>
+                               <object class="GtkHBox" id="hbox28">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+-                                <property name="spacing">0</property>
+                                 <child>
+                                   <object class="GtkLabel" id="captions_label_0">
+                                     <property name="visible">True</property>
+-                                    <property name="label"/>
+-                                    <property name="use_underline">False</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0.5</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -1532,54 +1048,27 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="captions_0_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model11</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
 +                                    <property name="items" translatable="yes"></property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                              <packing>
+                                   </packing>
+                                 </child>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
 +                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox29">
-+                                <property name="visible">True</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="captions_label_1">
-+                                    <property name="visible">True</property>
-+                                    <property name="use_underline">True</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="captions_1_combobox">
-+                                    <property name="visible">True</property>
+                               </packing>
+                             </child>
+                             <child>
+                               <object class="GtkHBox" id="hbox29">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+-                                <property name="spacing">0</property>
+                                 <child>
+                                   <object class="GtkLabel" id="captions_label_1">
+                                     <property name="visible">True</property>
+-                                    <property name="label"/>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0.5</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -1587,27 +1076,19 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="captions_1_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model12</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer12"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
 +                                    <property name="items" translatable="yes"></property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
+                                     </child>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">2</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox30">
-+                                <property name="visible">True</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="captions_label_2">
-+                                    <property name="visible">True</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="captions_2_combobox">
-+                                    <property name="visible">True</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1618,23 +1099,8 @@
+                                 <child>
+                                   <object class="GtkLabel" id="captions_label_2">
+                                     <property name="visible">True</property>
+-                                    <property name="label"/>
+-                                    <property name="use_underline">False</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0.5</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -1642,70 +1108,42 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="captions_2_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model13</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer13"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
 +                                    <property name="items" translatable="yes"></property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                              <packing>
+                                   </packing>
+                                 </child>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
 +                                <property name="position">3</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox31">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label34">
-+                        <property name="visible">True</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox31">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label34">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment9">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkHBox" id="hbox33">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">12</property>
-+                            <child>
-+                              <widget class="GtkLabel" id="label36">
-+                                <property name="visible">True</property>
-+                                <property name="label" translatable="yes">_Format:</property>
-+                                <property name="use_underline">True</property>
-+                                <property name="mnemonic_widget">date_format_combobox</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkComboBox" id="date_format_combobox">
-+                                <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -1713,40 +1151,19 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment9">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkHBox" id="hbox33">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">12</property>
+                             <child>
+                               <object class="GtkLabel" id="label36">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">_Format:</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="use_markup">False</property>
+-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                <property name="wrap">False</property>
+-                                <property name="selectable">False</property>
+-                                <property name="xalign">0.5</property>
+-                                <property name="yalign">0.5</property>
+-                                <property name="xpad">0</property>
+-                                <property name="ypad">0</property>
+                                 <property name="mnemonic_widget">date_format_combobox</property>
+-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                <property name="width_chars">-1</property>
+-                                <property name="single_line_mode">False</property>
+-                                <property name="angle">0</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+@@ -1754,94 +1171,59 @@
+                             <child>
+                               <object class="GtkComboBox" id="date_format_combobox">
+                                 <property name="visible">True</property>
+-                                <property name="add_tearoffs">False</property>
+-                                <property name="focus_on_click">True</property>
+-                                <property name="model">model14</property>
+-                                <child>
+-                                  <object class="GtkCellRendererText" id="renderer14"/>
+-                                  <attributes>
+-                                    <attribute name="text">0</attribute>
+-                                  </attributes>
+-                                </child>
 +                                <property name="items" translatable="yes"></property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
 +                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
 +                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+              </widget>
-+              <packing>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="tab_expand">False</property>
+-                <property name="tab_fill">True</property>
 +                <property name="position">2</property>
-+              </packing>
-+            </child>
+               </packing>
+             </child>
+-            <child type="tab">
 +            <child>
-+              <widget class="GtkLabel" id="label24">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Display</property>
-+              </widget>
+               <object class="GtkLabel" id="label24">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Display</property>
+-                <property name="use_underline">False</property>
+-                <property name="use_markup">False</property>
+-                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                <property name="wrap">False</property>
+-                <property name="selectable">False</property>
+-                <property name="xalign">0.5</property>
+-                <property name="yalign">0.5</property>
+-                <property name="xpad">0</property>
+-                <property name="ypad">0</property>
+-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                <property name="width_chars">-1</property>
+-                <property name="single_line_mode">False</property>
+-                <property name="angle">0</property>
+               </object>
 +              <packing>
 +                <property name="type">tab</property>
 +                <property name="position">2</property>
 +                <property name="tab_fill">False</property>
 +              </packing>
-+            </child>
+             </child>
+             <child>
+               <object class="GtkVBox" id="vbox29">
+                 <property name="border_width">12</property>
+                 <property name="visible">True</property>
+-                <property name="homogeneous">False</property>
+                 <property name="spacing">18</property>
+                 <child>
+                   <object class="GtkVBox" id="vbox30">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label31">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;List Columns&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -1849,39 +1231,18 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment21">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="list_columns_vbox">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkLabel" id="label33">
+                                 <property name="visible">True</property>
+-                                <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
+-                                <property name="use_underline">False</property>
+-                                <property name="use_markup">False</property>
+-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                <property name="wrap">True</property>
+-                                <property name="selectable">False</property>
+                                 <property name="xalign">0</property>
+-                                <property name="yalign">0.5</property>
+-                                <property name="xpad">0</property>
+-                                <property name="ypad">0</property>
+-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                <property name="width_chars">-1</property>
+-                                <property name="single_line_mode">False</property>
+-                                <property name="angle">0</property>
++                                <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+@@ -1893,74 +1254,44 @@
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
++                        <property name="position">1</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+-                    <property name="expand">True</property>
+-                    <property name="fill">True</property>
++                    <property name="position">3</property>
+                   </packing>
+                 </child>
+               </object>
+-              <packing>
+-                <property name="tab_expand">False</property>
+-                <property name="tab_fill">True</property>
+-              </packing>
+             </child>
+-            <child type="tab">
 +            <child>
-+              <widget class="GtkVBox" id="vbox29">
-+                <property name="visible">True</property>
-+                <property name="border_width">12</property>
-+                <property name="spacing">18</property>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox30">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label31">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;List Columns&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment21">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="list_columns_vbox">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkLabel" id="label33">
-+                                <property name="visible">True</property>
-+                                <property name="xalign">0</property>
-+                                <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
-+                                <property name="wrap">True</property>
-+                              </widget>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <placeholder/>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                </child>
-+              </widget>
-+              <packing>
-+                <property name="position">3</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <widget class="GtkLabel" id="label30">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">List Columns</property>
-+              </widget>
+               <object class="GtkLabel" id="label30">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">List Columns</property>
+-                <property name="use_underline">False</property>
+-                <property name="use_markup">False</property>
+-                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                <property name="wrap">False</property>
+-                <property name="selectable">False</property>
+-                <property name="xalign">0.5</property>
+-                <property name="yalign">0.5</property>
+-                <property name="xpad">0</property>
+-                <property name="ypad">0</property>
+-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                <property name="width_chars">-1</property>
+-                <property name="single_line_mode">False</property>
+-                <property name="angle">0</property>
+               </object>
 +              <packing>
 +                <property name="type">tab</property>
 +                <property name="position">3</property>
 +                <property name="tab_fill">False</property>
 +              </packing>
-+            </child>
-+            <child>
-+              <widget class="GtkVBox" id="vbox9">
-+                <property name="visible">True</property>
-+                <property name="border_width">12</property>
-+                <property name="spacing">18</property>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox10">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label16">
-+                        <property name="visible">True</property>
+             </child>
+             <child>
+               <object class="GtkVBox" id="vbox9">
+                 <property name="border_width">12</property>
+                 <property name="visible">True</property>
+-                <property name="homogeneous">False</property>
+                 <property name="spacing">18</property>
+                 <child>
+                   <object class="GtkVBox" id="vbox10">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label16">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Text Files&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment10">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox20">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox24">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="preview_label_0">
-+                                    <property name="visible">True</property>
-+                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Show te_xt in icons:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">preview_text_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="preview_text_combobox">
-+                                    <property name="visible">True</property>
-+                                    <property name="items" translatable="yes">Always
- Local Files Only
- Never</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox11">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label18">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Other Previewable Files&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment11">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox21">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox20">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="preview_label_1">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">Show _thumbnails:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">preview_image_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="preview_image_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">Always
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox11">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label18">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Other Previewable Files&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment11">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox21">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox20">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="preview_label_1">
-+                                    <property name="visible">True</property>
-+                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Show _thumbnails:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">preview_image_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="preview_image_combobox">
-+                                    <property name="visible">True</property>
-+                                    <property name="items" translatable="yes">Always
- Local Files Only
- Never</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox21">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="preview_label_2">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">_Only for files smaller than:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">preview_image_size_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="preview_image_size_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">100 KB
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox21">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="preview_label_2">
-+                                    <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Text Files&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -1968,45 +1299,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment10">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox20">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox24">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="preview_label_0">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">_Only for files smaller than:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">preview_image_size_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="preview_image_size_combobox">
-+                                    <property name="visible">True</property>
-+                                    <property name="items" translatable="yes">100 KB
- 500 KB
- 1 MB
- 3 MB
-@@ -2043,928 +1169,599 @@ Never</property>
- 10 MB
- 100 MB
- 1 GB</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox12">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label20">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Sound Files&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment12">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox22">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox22">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="preview_label_3">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">Preview _sound files:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">preview_sound_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="preview_sound_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">Always
-+                                  </widget>
-+                                  <packing>
+                                     <property name="label" translatable="yes">Show te_xt in icons:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">preview_text_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -2014,70 +1324,40 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="preview_text_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model6</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer6"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
++                                    <property name="items" translatable="yes">Always
++Local Files Only
++Never</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                              <packing>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                                   </packing>
+                                 </child>
+                               </object>
+-                              <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
+-                              </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox12">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label20">
-+                        <property name="visible">True</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox11">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label18">
+                         <property name="visible">True</property>
 +                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Sound Files&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment12">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox22">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox22">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="preview_label_3">
-+                                    <property name="visible">True</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Other Previewable Files&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -2085,45 +1365,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment11">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox21">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox20">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="preview_label_1">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Preview _sound files:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">preview_sound_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="preview_sound_combobox">
-+                                    <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Show _thumbnails:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">preview_image_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -2131,55 +1390,29 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="preview_image_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model7</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer7"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
 +                                    <property name="items" translatable="yes">Always
- Local Files Only
- Never</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="vbox13">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label22">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Folders&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment13">
--		      <property name="visible">True</property>
--		      <property name="xalign">0.5</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xscale">1</property>
--		      <property name="yscale">1</property>
--		      <property name="top_padding">0</property>
--		      <property name="bottom_padding">0</property>
--		      <property name="left_padding">12</property>
--		      <property name="right_padding">0</property>
--
--		      <child>
--			<widget class="GtkVBox" id="vbox23">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox23">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkLabel" id="preview_label_4">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">Count _number of items:</property>
--				  <property name="use_underline">True</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">preview_folder_combobox</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkComboBox" id="preview_folder_combobox">
--				  <property name="visible">True</property>
--				  <property name="items" translatable="yes">Always
-+                                  </widget>
-+                                  <packing>
++Local Files Only
++Never</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                          </widget>
-+                        </child>
-+                      </widget>
-+                      <packing>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkVBox" id="vbox13">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkLabel" id="label22">
-+                        <property name="visible">True</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">&lt;b&gt;Folders&lt;/b&gt;</property>
-+                        <property name="use_markup">True</property>
-+                      </widget>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkAlignment" id="alignment13">
-+                        <property name="visible">True</property>
-+                        <property name="left_padding">12</property>
-+                        <child>
-+                          <widget class="GtkVBox" id="vbox23">
-+                            <property name="visible">True</property>
-+                            <property name="spacing">6</property>
-+                            <child>
-+                              <widget class="GtkHBox" id="hbox23">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">12</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="preview_label_4">
-+                                    <property name="visible">True</property>
+                                   </packing>
+                                 </child>
+                               </object>
+-                              <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
+-                              </packing>
+                             </child>
+                             <child>
+                               <object class="GtkHBox" id="hbox21">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="preview_label_2">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Count _number of items:</property>
-+                                    <property name="use_underline">True</property>
-+                                    <property name="mnemonic_widget">preview_folder_combobox</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkComboBox" id="preview_folder_combobox">
-+                                    <property name="visible">True</property>
+                                     <property name="label" translatable="yes">_Only for files smaller than:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">preview_image_size_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -2187,70 +1420,49 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="preview_image_size_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model8</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer8"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
++                                    <property name="items" translatable="yes">100 KB
++500 KB
++1 MB
++3 MB
++5 MB
++10 MB
++100 MB
++1 GB</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
+                                   </packing>
+                                 </child>
+                               </object>
+                               <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
++                        <property name="position">1</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
++                    <property name="position">1</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox12">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label20">
+                         <property name="visible">True</property>
++                        <property name="xalign">0</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Sound Files&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -2258,45 +1470,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment12">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox22">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox22">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="preview_label_3">
+                                     <property name="visible">True</property>
++                                    <property name="xalign">0</property>
+                                     <property name="label" translatable="yes">Preview _sound files:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">preview_sound_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -2304,70 +1495,42 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="preview_sound_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model9</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer9"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
 +                                    <property name="items" translatable="yes">Always
- Local Files Only
- Never</property>
--				  <property name="add_tearoffs">False</property>
--				  <property name="focus_on_click">True</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--			</widget>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="label3">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Preview</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkVBox" id="vbox34">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">6</property>
--
--	      <child>
--		<widget class="GtkVBox" id="media_handling_vbox">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkVBox" id="vbox44">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">6</property>
--
--		      <child>
--			<widget class="GtkLabel" id="label42">
--			  <property name="visible">True</property>
--			  <property name="label" translatable="yes">&lt;b&gt;Media Handling&lt;/b&gt;</property>
--			  <property name="use_underline">False</property>
--			  <property name="use_markup">True</property>
--			  <property name="justify">GTK_JUSTIFY_LEFT</property>
--			  <property name="wrap">False</property>
--			  <property name="selectable">False</property>
--			  <property name="xalign">0</property>
--			  <property name="yalign">0.5</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--			  <property name="width_chars">-1</property>
--			  <property name="single_line_mode">False</property>
--			  <property name="angle">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkAlignment" id="alignment18">
--			  <property name="visible">True</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0.5</property>
--			  <property name="xscale">1</property>
--			  <property name="yscale">1</property>
--			  <property name="top_padding">0</property>
--			  <property name="bottom_padding">0</property>
--			  <property name="left_padding">12</property>
--			  <property name="right_padding">0</property>
--
--			  <child>
--			    <widget class="GtkVBox" id="vbox52">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">6</property>
--
--			      <child>
--				<widget class="GtkLabel" id="label60">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">Choose what happens when inserting media or connecting devices to the system</property>
--				  <property name="use_underline">False</property>
--				  <property name="use_markup">True</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">True</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkTable" id="table4">
--				  <property name="visible">True</property>
--				  <property name="n_rows">5</property>
--				  <property name="n_columns">2</property>
--				  <property name="homogeneous">False</property>
--				  <property name="row_spacing">6</property>
--				  <property name="column_spacing">6</property>
--
--				  <child>
--				    <widget class="GtkLabel" id="label44">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">CD _Audio:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">media_audio_cdda_combobox</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">0</property>
--				      <property name="right_attach">1</property>
--				      <property name="top_attach">0</property>
--				      <property name="bottom_attach">1</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options"></property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkLabel" id="label50">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">_DVD Video:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">media_video_dvd_combobox</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">0</property>
--				      <property name="right_attach">1</property>
--				      <property name="top_attach">1</property>
--				      <property name="bottom_attach">2</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options"></property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkComboBox" id="media_audio_cdda_combobox">
--				      <property name="visible">True</property>
--				      <property name="add_tearoffs">False</property>
--				      <property name="focus_on_click">True</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">1</property>
--				      <property name="right_attach">2</property>
--				      <property name="top_attach">0</property>
--				      <property name="bottom_attach">1</property>
--				      <property name="y_options">fill</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkComboBox" id="media_video_dvd_combobox">
--				      <property name="visible">True</property>
--				      <property name="add_tearoffs">False</property>
--				      <property name="focus_on_click">True</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">1</property>
--				      <property name="right_attach">2</property>
--				      <property name="top_attach">1</property>
--				      <property name="bottom_attach">2</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options">fill</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkLabel" id="label54">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">_Music Player:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">media_music_player_combobox</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">0</property>
--				      <property name="right_attach">1</property>
--				      <property name="top_attach">2</property>
--				      <property name="bottom_attach">3</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options"></property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkComboBox" id="media_music_player_combobox">
--				      <property name="visible">True</property>
--				      <property name="add_tearoffs">False</property>
--				      <property name="focus_on_click">True</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">1</property>
--				      <property name="right_attach">2</property>
--				      <property name="top_attach">2</property>
--				      <property name="bottom_attach">3</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options">fill</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkLabel" id="label59">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">_Photos:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">media_dcf_combobox</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">0</property>
--				      <property name="right_attach">1</property>
--				      <property name="top_attach">3</property>
--				      <property name="bottom_attach">4</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options"></property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkComboBox" id="media_dcf_combobox">
--				      <property name="visible">True</property>
--				      <property name="add_tearoffs">False</property>
--				      <property name="focus_on_click">True</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">1</property>
--				      <property name="right_attach">2</property>
--				      <property name="top_attach">3</property>
--				      <property name="bottom_attach">4</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options">fill</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkLabel" id="label57">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">_Software:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">media_software_combobox</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">0</property>
--				      <property name="right_attach">1</property>
--				      <property name="top_attach">4</property>
--				      <property name="bottom_attach">5</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options"></property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkComboBox" id="media_software_combobox">
--				      <property name="visible">True</property>
--				      <property name="add_tearoffs">False</property>
--				      <property name="focus_on_click">True</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">1</property>
--				      <property name="right_attach">2</property>
--				      <property name="top_attach">4</property>
--				      <property name="bottom_attach">5</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options">fill</property>
--				    </packing>
--				  </child>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkVBox" id="vbox50">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">6</property>
--
--		      <child>
--			<widget class="GtkLabel" id="label61">
--			  <property name="visible">True</property>
--			  <property name="label" translatable="yes">&lt;b&gt;Other Media&lt;/b&gt;</property>
--			  <property name="use_underline">False</property>
--			  <property name="use_markup">True</property>
--			  <property name="justify">GTK_JUSTIFY_LEFT</property>
--			  <property name="wrap">False</property>
--			  <property name="selectable">False</property>
--			  <property name="xalign">0</property>
--			  <property name="yalign">0.5</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--			  <property name="width_chars">-1</property>
--			  <property name="single_line_mode">False</property>
--			  <property name="angle">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkAlignment" id="alignment20">
--			  <property name="visible">True</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0.5</property>
--			  <property name="xscale">1</property>
--			  <property name="yscale">1</property>
--			  <property name="top_padding">0</property>
--			  <property name="bottom_padding">0</property>
--			  <property name="left_padding">12</property>
--			  <property name="right_padding">0</property>
--
--			  <child>
--			    <widget class="GtkVBox" id="vbox51">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">6</property>
--
--			      <child>
--				<widget class="GtkLabel" id="label65">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">Less common media formats can be configured here</property>
--				  <property name="use_underline">False</property>
--				  <property name="use_markup">True</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">True</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkTable" id="table5">
--				  <property name="visible">True</property>
--				  <property name="n_rows">2</property>
--				  <property name="n_columns">2</property>
--				  <property name="homogeneous">False</property>
--				  <property name="row_spacing">6</property>
--				  <property name="column_spacing">6</property>
--
--				  <child>
--				    <widget class="GtkComboBox" id="media_other_type_combobox">
--				      <property name="visible">True</property>
--				      <property name="add_tearoffs">False</property>
--				      <property name="focus_on_click">True</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">1</property>
--				      <property name="right_attach">2</property>
--				      <property name="top_attach">0</property>
--				      <property name="bottom_attach">1</property>
--				      <property name="y_options">fill</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkLabel" id="label64">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">Acti_on:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">media_other_action_combobox</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">0</property>
--				      <property name="right_attach">1</property>
--				      <property name="top_attach">1</property>
--				      <property name="bottom_attach">2</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options"></property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkComboBox" id="media_other_action_combobox">
--				      <property name="visible">True</property>
--				      <property name="add_tearoffs">False</property>
--				      <property name="focus_on_click">True</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">1</property>
--				      <property name="right_attach">2</property>
--				      <property name="top_attach">1</property>
--				      <property name="bottom_attach">2</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options">fill</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkLabel" id="label63">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">_Type:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">media_other_type_combobox</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="left_attach">0</property>
--				      <property name="right_attach">1</property>
--				      <property name="top_attach">0</property>
--				      <property name="bottom_attach">1</property>
--				      <property name="x_options">fill</property>
--				      <property name="y_options"></property>
--				    </packing>
--				  </child>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">False</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkCheckButton" id="media_autorun_never_checkbutton">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="label" translatable="yes">_Never prompt or start programs on media insertion</property>
--		  <property name="use_underline">True</property>
--		  <property name="relief">GTK_RELIEF_NORMAL</property>
--		  <property name="focus_on_click">True</property>
--		  <property name="active">False</property>
--		  <property name="inconsistent">False</property>
--		  <property name="draw_indicator">True</property>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">False</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkCheckButton" id="media_automount_open_checkbutton">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="label" translatable="yes">B_rowse media when inserted</property>
--		  <property name="use_underline">True</property>
--		  <property name="relief">GTK_RELIEF_NORMAL</property>
--		  <property name="focus_on_click">True</property>
--		  <property name="active">False</property>
--		  <property name="inconsistent">False</property>
--		  <property name="draw_indicator">True</property>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">False</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="label38">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Media</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--	</widget>
--	<packing>
--	  <property name="padding">0</property>
--	  <property name="expand">True</property>
--	  <property name="fill">True</property>
--	</packing>
--      </child>
--    </widget>
--  </child>
--</widget>
--
-+                                  </widget>
-+                                  <packing>
++Local Files Only
++Never</property>
++
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
+                                   </packing>
+                                 </child>
+                               </object>
+-                              <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
+-                              </packing>
+                             </child>
+                           </object>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
++                        <property name="position">1</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
++                    <property name="position">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkVBox" id="vbox13">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkLabel" id="label22">
+                         <property name="visible">True</property>
++                        <property name="xalign">0</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Folders&lt;/b&gt;</property>
+-                        <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                        <property name="wrap">False</property>
+-                        <property name="selectable">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xpad">0</property>
+-                        <property name="ypad">0</property>
+-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                        <property name="width_chars">-1</property>
+-                        <property name="single_line_mode">False</property>
+-                        <property name="angle">0</property>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+@@ -2375,45 +1538,24 @@
+                     <child>
+                       <object class="GtkAlignment" id="alignment13">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0.5</property>
+-                        <property name="yalign">0.5</property>
+-                        <property name="xscale">1</property>
+-                        <property name="yscale">1</property>
+-                        <property name="top_padding">0</property>
+-                        <property name="bottom_padding">0</property>
+                         <property name="left_padding">12</property>
+-                        <property name="right_padding">0</property>
+                         <child>
+                           <object class="GtkVBox" id="vbox23">
+                             <property name="visible">True</property>
+-                            <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+                             <child>
+                               <object class="GtkHBox" id="hbox23">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+                                 <child>
+                                   <object class="GtkLabel" id="preview_label_4">
+                                     <property name="visible">True</property>
++                                    <property name="xalign">0</property>
+                                     <property name="label" translatable="yes">Count _number of items:</property>
+                                     <property name="use_underline">True</property>
+-                                    <property name="use_markup">False</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                    <property name="wrap">False</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">preview_folder_combobox</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -2421,106 +1563,83 @@
+                                 <child>
+                                   <object class="GtkComboBox" id="preview_folder_combobox">
+                                     <property name="visible">True</property>
+-                                    <property name="add_tearoffs">False</property>
+-                                    <property name="focus_on_click">True</property>
+-                                    <property name="model">model10</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer10"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
++                                    <property name="items" translatable="yes">Al
++ways
++Local Files Only
++Never</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
+                                   </packing>
+                                 </child>
+                               </object>
 +                            </child>
++                          </object>
 +                            <child>
 +                              <widget class="GtkCheckButton" id="time_slider_enabled_checkbutton">
 +                                <property name="visible">True</property>
@@ -6286,449 +4387,636 @@
 +                                <property name="response_id">0</property>
 +                                <property name="draw_indicator">True</property>
 +                              </widget>
-+                              <packing>
+                               <packing>
+-                                <property name="padding">0</property>
+-                                <property name="expand">True</property>
+-                                <property name="fill">True</property>
 +                                <property name="expand">False</property>
 +                                <property name="fill">False</property>
 +                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
+                               </packing>
+                             </child>
+-                          </object>
 +                          </widget>
-+                        </child>
+                         </child>
+-                      </object>
 +                      </widget>
-+                      <packing>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
+                       </packing>
+                     </child>
+-                  </object>
 +                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
 +                    <property name="position">3</property>
-+                  </packing>
-+                </child>
+                   </packing>
+                 </child>
+-              </object>
 +              </widget>
-+              <packing>
+               <packing>
+-                <property name="tab_expand">False</property>
+-                <property name="tab_fill">True</property>
 +                <property name="position">4</property>
-+              </packing>
-+            </child>
+               </packing>
+             </child>
+-            <child type="tab">
+-              <object class="GtkLabel" id="label3">
 +            <child>
 +              <widget class="GtkLabel" id="label7">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Preview</property>
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Preview</property>
+-                <property name="use_underline">False</property>
+-                <property name="use_markup">False</property>
+-                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                <property name="wrap">False</property>
+-                <property name="selectable">False</property>
+-                <property name="xalign">0.5</property>
+-                <property name="yalign">0.5</property>
+-                <property name="xpad">0</property>
+-                <property name="ypad">0</property>
+-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                <property name="width_chars">-1</property>
+-                <property name="single_line_mode">False</property>
+-                <property name="angle">0</property>
 +              </widget>
 +              <packing>
 +                <property name="type">tab</property>
 +                <property name="position">4</property>
 +                <property name="tab_fill">False</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <widget class="GtkVBox" id="vbox34">
-+                <property name="visible">True</property>
-+                <property name="border_width">12</property>
-+                <property name="spacing">6</property>
-+                <child>
-+                  <widget class="GtkVBox" id="media_handling_vbox">
-+                    <property name="visible">True</property>
-+                    <property name="spacing">6</property>
-+                    <child>
-+                      <widget class="GtkVBox" id="vbox44">
-+                        <property name="visible">True</property>
-+                        <property name="spacing">6</property>
-+                        <child>
-+                          <widget class="GtkLabel" id="label42">
-+                            <property name="visible">True</property>
+               </object>
+             </child>
+             <child>
+               <object class="GtkVBox" id="vbox34">
+                 <property name="border_width">12</property>
+                 <property name="visible">True</property>
+-                <property name="homogeneous">False</property>
+                 <property name="spacing">6</property>
+                 <child>
+                   <object class="GtkVBox" id="media_handling_vbox">
+                     <property name="visible">True</property>
+-                    <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+                     <child>
+                       <object class="GtkVBox" id="vbox44">
+                         <property name="visible">True</property>
+-                        <property name="homogeneous">False</property>
+                         <property name="spacing">6</property>
+                         <child>
+                           <object class="GtkLabel" id="label42">
+                             <property name="visible">True</property>
 +                            <property name="xalign">0</property>
-+                            <property name="label" translatable="yes">&lt;b&gt;Media Handling&lt;/b&gt;</property>
-+                            <property name="use_markup">True</property>
-+                          </widget>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <widget class="GtkAlignment" id="alignment18">
-+                            <property name="visible">True</property>
-+                            <property name="left_padding">12</property>
-+                            <child>
-+                              <widget class="GtkVBox" id="vbox52">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">6</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="label60">
-+                                    <property name="visible">True</property>
+                             <property name="label" translatable="yes">&lt;b&gt;Media Handling&lt;/b&gt;</property>
+-                            <property name="use_underline">False</property>
+                             <property name="use_markup">True</property>
+-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                            <property name="wrap">False</property>
+-                            <property name="selectable">False</property>
+-                            <property name="xalign">0</property>
+-                            <property name="yalign">0.5</property>
+-                            <property name="xpad">0</property>
+-                            <property name="ypad">0</property>
+-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                            <property name="width_chars">-1</property>
+-                            <property name="single_line_mode">False</property>
+-                            <property name="angle">0</property>
+                           </object>
+                           <packing>
+-                            <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+@@ -2528,14 +1647,7 @@
+                         <child>
+                           <object class="GtkAlignment" id="alignment18">
+                             <property name="visible">True</property>
+-                            <property name="xalign">0.5</property>
+-                            <property name="yalign">0.5</property>
+-                            <property name="xscale">1</property>
+-                            <property name="yscale">1</property>
+-                            <property name="top_padding">0</property>
+-                            <property name="bottom_padding">0</property>
+                             <property name="left_padding">12</property>
+-                            <property name="right_padding">0</property>
+                             <child>
+                               <object class="GtkVBox" id="vbox52">
+                                 <property name="visible">True</property>
+@@ -2544,23 +1656,11 @@
+                                 <child>
+                                   <object class="GtkLabel" id="label60">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Choose what happens when inserting media or connecting devices to the system</property>
-+                                    <property name="use_markup">True</property>
-+                                    <property name="wrap">True</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkTable" id="table4">
-+                                    <property name="visible">True</property>
-+                                    <property name="n_rows">5</property>
-+                                    <property name="n_columns">2</property>
-+                                    <property name="column_spacing">6</property>
-+                                    <property name="row_spacing">6</property>
-+                                    <child>
-+                                      <widget class="GtkLabel" id="label44">
-+                                        <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Choose what happens when inserting media or connecting devices to the system</property>
+-                                    <property name="use_underline">False</property>
+                                     <property name="use_markup">True</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">True</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+-                                  </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -2570,33 +1670,18 @@
+                                     <property name="visible">True</property>
+                                     <property name="n_rows">5</property>
+                                     <property name="n_columns">2</property>
+-                                    <property name="homogeneous">False</property>
+                                     <property name="row_spacing">6</property>
+                                     <property name="column_spacing">6</property>
+                                     <child>
+                                       <object class="GtkLabel" id="label44">
+                                         <property name="visible">True</property>
 +                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">CD _Audio:</property>
-+                                        <property name="use_underline">True</property>
-+                                        <property name="mnemonic_widget">media_audio_cdda_combobox</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options"></property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkLabel" id="label50">
-+                                        <property name="visible">True</property>
+                                         <property name="label" translatable="yes">CD _Audio:</property>
+                                         <property name="use_underline">True</property>
+-                                        <property name="use_markup">False</property>
+                                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                        <property name="wrap">False</property>
+-                                        <property name="selectable">False</property>
+-                                        <property name="xalign">0</property>
+-                                        <property name="yalign">0.5</property>
+-                                        <property name="xpad">0</property>
+-                                        <property name="ypad">0</property>
+                                         <property name="mnemonic_widget">media_audio_cdda_combobox</property>
+-                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                        <property name="width_chars">-1</property>
+-                                        <property name="single_line_mode">False</property>
+-                                        <property name="angle">0</property>
+                                       </object>
+                                       <packing>
+-                                        <property name="left_attach">0</property>
+-                                        <property name="right_attach">1</property>
+-                                        <property name="top_attach">0</property>
+-                                        <property name="bottom_attach">1</property>
+                                         <property name="x_options">fill</property>
+                                         <property name="y_options"/>
+                                       </packing>
+@@ -2604,25 +1689,13 @@
+                                     <child>
+                                       <object class="GtkLabel" id="label50">
+                                         <property name="visible">True</property>
 +                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">_DVD Video:</property>
-+                                        <property name="use_underline">True</property>
-+                                        <property name="mnemonic_widget">media_video_dvd_combobox</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="top_attach">1</property>
-+                                        <property name="bottom_attach">2</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options"></property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkComboBox" id="media_audio_cdda_combobox">
-+                                        <property name="visible">True</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="right_attach">2</property>
-+                                        <property name="y_options">GTK_FILL</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkComboBox" id="media_video_dvd_combobox">
-+                                        <property name="visible">True</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="right_attach">2</property>
-+                                        <property name="top_attach">1</property>
-+                                        <property name="bottom_attach">2</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options">GTK_FILL</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkLabel" id="label54">
-+                                        <property name="visible">True</property>
+                                         <property name="label" translatable="yes">_DVD Video:</property>
+                                         <property name="use_underline">True</property>
+-                                        <property name="use_markup">False</property>
+-                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                        <property name="wrap">False</property>
+-                                        <property name="selectable">False</property>
+-                                        <property name="xalign">0</property>
+-                                        <property name="yalign">0.5</property>
+-                                        <property name="xpad">0</property>
+-                                        <property name="ypad">0</property>
+                                         <property name="mnemonic_widget">media_video_dvd_combobox</property>
+                                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                        <property name="width_chars">-1</property>
+-                                        <property name="single_line_mode">False</property>
+-                                        <property name="angle">0</property>
+                                       </object>
+                                       <packing>
+-                                        <property name="left_attach">0</property>
+-                                        <property name="right_attach">1</property>
+                                         <property name="top_attach">1</property>
+                                         <property name="bottom_attach">2</property>
+                                         <property name="x_options">fill</property>
+@@ -2632,22 +1705,16 @@
+                                     <child>
+                                       <object class="GtkComboBox" id="media_audio_cdda_combobox">
+                                         <property name="visible">True</property>
+-                                        <property name="add_tearoffs">False</property>
+-                                        <property name="focus_on_click">True</property>
+                                       </object>
+                                       <packing>
+                                         <property name="left_attach">1</property>
+                                         <property name="right_attach">2</property>
+-                                        <property name="top_attach">0</property>
+-                                        <property name="bottom_attach">1</property>
+                                         <property name="y_options">fill</property>
+                                       </packing>
+                                     </child>
+                                     <child>
+                                       <object class="GtkComboBox" id="media_video_dvd_combobox">
+                                         <property name="visible">True</property>
+-                                        <property name="add_tearoffs">False</property>
+-                                        <property name="focus_on_click">True</property>
+                                       </object>
+                                       <packing>
+                                         <property name="left_attach">1</property>
+@@ -2661,25 +1728,12 @@
+                                     <child>
+                                       <object class="GtkLabel" id="label54">
+                                         <property name="visible">True</property>
 +                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">_Music Player:</property>
-+                                        <property name="use_underline">True</property>
-+                                        <property name="mnemonic_widget">media_music_player_combobox</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="top_attach">2</property>
-+                                        <property name="bottom_attach">3</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options"></property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkComboBox" id="media_music_player_combobox">
-+                                        <property name="visible">True</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="right_attach">2</property>
-+                                        <property name="top_attach">2</property>
-+                                        <property name="bottom_attach">3</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options">GTK_FILL</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkLabel" id="label59">
-+                                        <property name="visible">True</property>
+                                         <property name="label" translatable="yes">_Music Player:</property>
+                                         <property name="use_underline">True</property>
+-                                        <property name="use_markup">False</property>
+-                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                        <property name="wrap">False</property>
+-                                        <property name="selectable">False</property>
+-                                        <property name="xalign">0</property>
+-                                        <property name="yalign">0.5</property>
+-                                        <property name="xpad">0</property>
+-                                        <property name="ypad">0</property>
+                                         <property name="mnemonic_widget">media_music_player_combobox</property>
+-                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                        <property name="width_chars">-1</property>
+-                                        <property name="single_line_mode">False</property>
+-                                        <property name="angle">0</property>
+                                       </object>
+                                       <packing>
+-                                        <property name="left_attach">0</property>
+-                                        <property name="right_attach">1</property>
+                                         <property name="top_attach">2</property>
+                                         <property name="bottom_attach">3</property>
+                                         <property name="x_options">fill</property>
+@@ -2689,8 +1743,6 @@
+                                     <child>
+                                       <object class="GtkComboBox" id="media_music_player_combobox">
+                                         <property name="visible">True</property>
+-                                        <property name="add_tearoffs">False</property>
+-                                        <property name="focus_on_click">True</property>
+                                       </object>
+                                       <packing>
+                                         <property name="left_attach">1</property>
+@@ -2704,25 +1756,12 @@
+                                     <child>
+                                       <object class="GtkLabel" id="label59">
+                                         <property name="visible">True</property>
 +                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">_Photos:</property>
-+                                        <property name="use_underline">True</property>
-+                                        <property name="mnemonic_widget">media_dcf_combobox</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="top_attach">3</property>
-+                                        <property name="bottom_attach">4</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options"></property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkComboBox" id="media_dcf_combobox">
-+                                        <property name="visible">True</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="right_attach">2</property>
-+                                        <property name="top_attach">3</property>
-+                                        <property name="bottom_attach">4</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options">GTK_FILL</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkLabel" id="label57">
-+                                        <property name="visible">True</property>
+                                         <property name="label" translatable="yes">_Photos:</property>
+                                         <property name="use_underline">True</property>
+-                                        <property name="use_markup">False</property>
+-                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                        <property name="wrap">False</property>
+-                                        <property name="selectable">False</property>
+-                                        <property name="xalign">0</property>
+-                                        <property name="yalign">0.5</property>
+-                                        <property name="xpad">0</property>
+-                                        <property name="ypad">0</property>
+                                         <property name="mnemonic_widget">media_dcf_combobox</property>
+-                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                        <property name="width_chars">-1</property>
+-                                        <property name="single_line_mode">False</property>
+-                                        <property name="angle">0</property>
+                                       </object>
+                                       <packing>
+-                                        <property name="left_attach">0</property>
+-                                        <property name="right_attach">1</property>
+                                         <property name="top_attach">3</property>
+                                         <property name="bottom_attach">4</property>
+                                         <property name="x_options">fill</property>
+@@ -2732,8 +1771,6 @@
+                                     <child>
+                                       <object class="GtkComboBox" id="media_dcf_combobox">
+                                         <property name="visible">True</property>
+-                                        <property name="add_tearoffs">False</property>
+-                                        <property name="focus_on_click">True</property>
+                                       </object>
+                                       <packing>
+                                         <property name="left_attach">1</property>
+@@ -2747,25 +1784,12 @@
+                                     <child>
+                                       <object class="GtkLabel" id="label57">
+                                         <property name="visible">True</property>
 +                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">_Software:</property>
-+                                        <property name="use_underline">True</property>
-+                                        <property name="mnemonic_widget">media_software_combobox</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="top_attach">4</property>
-+                                        <property name="bottom_attach">5</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options"></property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkComboBox" id="media_software_combobox">
-+                                        <property name="visible">True</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="right_attach">2</property>
-+                                        <property name="top_attach">4</property>
-+                                        <property name="bottom_attach">5</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options">GTK_FILL</property>
-+                                      </packing>
-+                                    </child>
-+                                  </widget>
-+                                  <packing>
+                                         <property name="label" translatable="yes">_Software:</property>
+                                         <property name="use_underline">True</property>
+-                                        <property name="use_markup">False</property>
+-                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                        <property name="wrap">False</property>
+-                                        <property name="selectable">False</property>
+-                                        <property name="xalign">0</property>
+-                                        <property name="yalign">0.5</property>
+-                                        <property name="xpad">0</property>
+-                                        <property name="ypad">0</property>
+                                         <property name="mnemonic_widget">media_software_combobox</property>
+-                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                        <property name="width_chars">-1</property>
+-                                        <property name="single_line_mode">False</property>
+-                                        <property name="angle">0</property>
+                                       </object>
+                                       <packing>
+-                                        <property name="left_attach">0</property>
+-                                        <property name="right_attach">1</property>
+                                         <property name="top_attach">4</property>
+                                         <property name="bottom_attach">5</property>
+                                         <property name="x_options">fill</property>
+@@ -2775,8 +1799,6 @@
+                                     <child>
+                                       <object class="GtkComboBox" id="media_software_combobox">
+                                         <property name="visible">True</property>
+-                                        <property name="add_tearoffs">False</property>
+-                                        <property name="focus_on_click">True</property>
+                                       </object>
+                                       <packing>
+                                         <property name="left_attach">1</property>
+@@ -2789,52 +1811,30 @@
+                                     </child>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                          </widget>
-+                          <packing>
+                                   </packing>
+                                 </child>
+                               </object>
+                             </child>
+                           </object>
+                           <packing>
+-                            <property name="padding">0</property>
+-                            <property name="expand">True</property>
+-                            <property name="fill">True</property>
 +                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </widget>
-+                    </child>
-+                    <child>
-+                      <widget class="GtkVBox" id="vbox50">
-+                        <property name="visible">True</property>
-+                        <property name="spacing">6</property>
-+                        <child>
-+                          <widget class="GtkLabel" id="label61">
-+                            <property name="visible">True</property>
+                           </packing>
+                         </child>
+                       </object>
+-                      <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
+-                      </packing>
+                     </child>
+                     <child>
+                       <object class="GtkVBox" id="vbox50">
+                         <property name="visible">True</property>
+-                        <property name="homogeneous">False</property>
+                         <property name="spacing">6</property>
+                         <child>
+                           <object class="GtkLabel" id="label61">
+                             <property name="visible">True</property>
 +                            <property name="xalign">0</property>
-+                            <property name="label" translatable="yes">&lt;b&gt;Other Media&lt;/b&gt;</property>
-+                            <property name="use_markup">True</property>
-+                          </widget>
-+                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">False</property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <widget class="GtkAlignment" id="alignment20">
-+                            <property name="visible">True</property>
-+                            <property name="left_padding">12</property>
-+                            <child>
-+                              <widget class="GtkVBox" id="vbox51">
-+                                <property name="visible">True</property>
-+                                <property name="spacing">6</property>
-+                                <child>
-+                                  <widget class="GtkLabel" id="label65">
-+                                    <property name="visible">True</property>
+                             <property name="label" translatable="yes">&lt;b&gt;Other Media&lt;/b&gt;</property>
+-                            <property name="use_underline">False</property>
+                             <property name="use_markup">True</property>
+-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                            <property name="wrap">False</property>
+-                            <property name="selectable">False</property>
+-                            <property name="xalign">0</property>
+-                            <property name="yalign">0.5</property>
+-                            <property name="xpad">0</property>
+-                            <property name="ypad">0</property>
+-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                            <property name="width_chars">-1</property>
+-                            <property name="single_line_mode">False</property>
+-                            <property name="angle">0</property>
+                           </object>
+                           <packing>
+-                            <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+@@ -2842,39 +1842,20 @@
+                         <child>
+                           <object class="GtkAlignment" id="alignment20">
+                             <property name="visible">True</property>
+-                            <property name="xalign">0.5</property>
+-                            <property name="yalign">0.5</property>
+-                            <property name="xscale">1</property>
+-                            <property name="yscale">1</property>
+-                            <property name="top_padding">0</property>
+-                            <property name="bottom_padding">0</property>
+                             <property name="left_padding">12</property>
+-                            <property name="right_padding">0</property>
+                             <child>
+                               <object class="GtkVBox" id="vbox51">
+                                 <property name="visible">True</property>
+-                                <property name="homogeneous">False</property>
+                                 <property name="spacing">6</property>
+                                 <child>
+                                   <object class="GtkLabel" id="label65">
+                                     <property name="visible">True</property>
 +                                    <property name="xalign">0</property>
-+                                    <property name="label" translatable="yes">Less common media formats can be configured here</property>
-+                                    <property name="use_markup">True</property>
-+                                    <property name="wrap">True</property>
-+                                  </widget>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <widget class="GtkTable" id="table5">
-+                                    <property name="visible">True</property>
-+                                    <property name="n_rows">2</property>
-+                                    <property name="n_columns">2</property>
-+                                    <property name="column_spacing">6</property>
-+                                    <property name="row_spacing">6</property>
-+                                    <child>
-+                                      <widget class="GtkComboBox" id="media_other_type_combobox">
-+                                        <property name="visible">True</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="right_attach">2</property>
-+                                        <property name="y_options">GTK_FILL</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkLabel" id="label64">
-+                                        <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Less common media formats can be configured here</property>
+-                                    <property name="use_underline">False</property>
+                                     <property name="use_markup">True</property>
+-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">True</property>
+-                                    <property name="selectable">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="yalign">0.5</property>
+-                                    <property name="xpad">0</property>
+-                                    <property name="ypad">0</property>
+-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                    <property name="width_chars">-1</property>
+-                                    <property name="single_line_mode">False</property>
+-                                    <property name="angle">0</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+@@ -2884,45 +1865,27 @@
+                                     <property name="visible">True</property>
+                                     <property name="n_rows">2</property>
+                                     <property name="n_columns">2</property>
+-                                    <property name="homogeneous">False</property>
+                                     <property name="row_spacing">6</property>
+                                     <property name="column_spacing">6</property>
+                                     <child>
+                                       <object class="GtkComboBox" id="media_other_type_combobox">
+                                         <property name="visible">True</property>
+-                                        <property name="add_tearoffs">False</property>
+-                                        <property name="focus_on_click">True</property>
+                                       </object>
+                                       <packing>
+                                         <property name="left_attach">1</property>
+                                         <property name="right_attach">2</property>
+-                                        <property name="top_attach">0</property>
+-                                        <property name="bottom_attach">1</property>
+                                         <property name="y_options">fill</property>
+                                       </packing>
+                                     </child>
+                                     <child>
+                                       <object class="GtkLabel" id="label64">
+                                         <property name="visible">True</property>
 +                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">Acti_on:</property>
-+                                        <property name="use_underline">True</property>
-+                                        <property name="mnemonic_widget">media_other_action_combobox</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="top_attach">1</property>
-+                                        <property name="bottom_attach">2</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options"></property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkComboBox" id="media_other_action_combobox">
-+                                        <property name="visible">True</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="right_attach">2</property>
-+                                        <property name="top_attach">1</property>
-+                                        <property name="bottom_attach">2</property>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options">GTK_FILL</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <widget class="GtkLabel" id="label63">
-+                                        <property name="visible">True</property>
+                                         <property name="label" translatable="yes">Acti_on:</property>
+                                         <property name="use_underline">True</property>
+-                                        <property name="use_markup">False</property>
+-                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                        <property name="wrap">False</property>
+-                                        <property name="selectable">False</property>
+-                                        <property name="xalign">0</property>
+-                                        <property name="yalign">0.5</property>
+-                                        <property name="xpad">0</property>
+-                                        <property name="ypad">0</property>
+                                         <property name="mnemonic_widget">media_other_action_combobox</property>
+-                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                        <property name="width_chars">-1</property>
+-                                        <property name="single_line_mode">False</property>
+-                                        <property name="angle">0</property>
+                                       </object>
+                                       <packing>
+-                                        <property name="left_attach">0</property>
+-                                        <property name="right_attach">1</property>
+                                         <property name="top_attach">1</property>
+                                         <property name="bottom_attach">2</property>
+                                         <property name="x_options">fill</property>
+@@ -2932,8 +1895,6 @@
+                                     <child>
+                                       <object class="GtkComboBox" id="media_other_action_combobox">
+                                         <property name="visible">True</property>
+-                                        <property name="add_tearoffs">False</property>
+-                                        <property name="focus_on_click">True</property>
+                                       </object>
+                                       <packing>
+                                         <property name="left_attach">1</property>
+@@ -2947,57 +1908,35 @@
+                                     <child>
+                                       <object class="GtkLabel" id="label63">
+                                         <property name="visible">True</property>
 +                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">_Type:</property>
-+                                        <property name="use_underline">True</property>
-+                                        <property name="mnemonic_widget">media_other_type_combobox</property>
-+                                      </widget>
-+                                      <packing>
-+                                        <property name="x_options">GTK_FILL</property>
-+                                        <property name="y_options"></property>
-+                                      </packing>
-+                                    </child>
-+                                  </widget>
-+                                  <packing>
+                                         <property name="label" translatable="yes">_Type:</property>
+                                         <property name="use_underline">True</property>
+-                                        <property name="use_markup">False</property>
+-                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                                        <property name="wrap">False</property>
+-                                        <property name="selectable">False</property>
+-                                        <property name="xalign">0</property>
+-                                        <property name="yalign">0.5</property>
+-                                        <property name="xpad">0</property>
+-                                        <property name="ypad">0</property>
+                                         <property name="mnemonic_widget">media_other_type_combobox</property>
+-                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                                        <property name="width_chars">-1</property>
+-                                        <property name="single_line_mode">False</property>
+-                                        <property name="angle">0</property>
+                                       </object>
+                                       <packing>
+-                                        <property name="left_attach">0</property>
+-                                        <property name="right_attach">1</property>
+-                                        <property name="top_attach">0</property>
+-                                        <property name="bottom_attach">1</property>
+                                         <property name="x_options">fill</property>
+                                         <property name="y_options"/>
+                                       </packing>
+                                     </child>
+                                   </object>
+                                   <packing>
+-                                    <property name="padding">0</property>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
 +                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </widget>
-+                            </child>
-+                          </widget>
-+                          <packing>
+                                   </packing>
+                                 </child>
+                               </object>
+                             </child>
+                           </object>
+                           <packing>
+-                            <property name="padding">0</property>
+-                            <property name="expand">True</property>
+-                            <property name="fill">True</property>
 +                            <property name="position">1</property>
-+                          </packing>
-+                        </child>
-+                      </widget>
-+                      <packing>
+                           </packing>
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="padding">0</property>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
 +                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="fill">False</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkCheckButton" id="media_autorun_never_checkbutton">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="label" translatable="yes">_Never prompt or start programs on media insertion</property>
-+                    <property name="use_underline">True</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+@@ -3008,16 +1947,13 @@
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">_Never prompt or start programs on media insertion</property>
+                     <property name="use_underline">True</property>
+-                    <property name="relief">GTK_RELIEF_NORMAL</property>
+-                    <property name="focus_on_click">True</property>
+-                    <property name="active">False</property>
+-                    <property name="inconsistent">False</property>
 +                    <property name="response_id">0</property>
-+                    <property name="draw_indicator">True</property>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="fill">False</property>
+                     <property name="draw_indicator">True</property>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
 +                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <widget class="GtkCheckButton" id="media_automount_open_checkbutton">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="label" translatable="yes">B_rowse media when inserted</property>
-+                    <property name="use_underline">True</property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -3026,48 +1962,34 @@
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">B_rowse media when inserted</property>
+                     <property name="use_underline">True</property>
+-                    <property name="relief">GTK_RELIEF_NORMAL</property>
+-                    <property name="focus_on_click">True</property>
+-                    <property name="active">False</property>
+-                    <property name="inconsistent">False</property>
 +                    <property name="response_id">0</property>
-+                    <property name="draw_indicator">True</property>
-+                  </widget>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="fill">False</property>
+                     <property name="draw_indicator">True</property>
+                   </object>
+                   <packing>
+-                    <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
 +                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+              </widget>
-+              <packing>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="tab_expand">False</property>
+-                <property name="tab_fill">True</property>
 +                <property name="position">5</property>
-+              </packing>
-+            </child>
+               </packing>
+             </child>
+-            <child type="tab">
 +            <child>
-+              <widget class="GtkLabel" id="label38">
-+                <property name="visible">True</property>
-+                <property name="label" translatable="yes">Media</property>
-+              </widget>
+               <object class="GtkLabel" id="label38">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Media</property>
+-                <property name="use_underline">False</property>
+-                <property name="use_markup">False</property>
+-                <property name="justify">GTK_JUSTIFY_LEFT</property>
+-                <property name="wrap">False</property>
+-                <property name="selectable">False</property>
+-                <property name="xalign">0.5</property>
+-                <property name="yalign">0.5</property>
+-                <property name="xpad">0</property>
+-                <property name="ypad">0</property>
+-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-                <property name="width_chars">-1</property>
+-                <property name="single_line_mode">False</property>
+-                <property name="angle">0</property>
+               </object>
 +              <packing>
 +                <property name="type">tab</property>
 +                <property name="position">5</property>
 +                <property name="tab_fill">False</property>
 +              </packing>
-+            </child>
-+          </widget>
-+          <packing>
+             </child>
+           </object>
+           <packing>
+-            <property name="padding">0</property>
+-            <property name="expand">True</property>
+-            <property name="fill">True</property>
 +            <property name="position">1</property>
-+          </packing>
-+        </child>
-+        <child internal-child="action_area">
-+          <widget class="GtkHButtonBox" id="dialog-action_area1">
-+            <property name="visible">True</property>
-+            <property name="layout_style">GTK_BUTTONBOX_END</property>
-+            <child>
-+              <widget class="GtkButton" id="helpbutton1">
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="label">gtk-help</property>
-+                <property name="use_stock">True</property>
-+                <property name="response_id">-11</property>
-+              </widget>
-+            </child>
-+            <child>
-+              <widget class="GtkButton" id="closebutton1">
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="label">gtk-close</property>
-+                <property name="use_stock">True</property>
-+                <property name="response_id">-7</property>
-+              </widget>
-+              <packing>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+          </widget>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="pack_type">GTK_PACK_END</property>
-+          </packing>
-+        </child>
-+      </widget>
-+    </child>
-+  </widget>
- </glade-interface>
+           </packing>
+         </child>
+       </object>
 diff -x '*.out' -x '*.*~' -x '*.orig' -x '*.rej' -rupN nautilus-2.24.2/src/nautilus-navigation-window-ui.xml ../nautilus-full-async/src/nautilus-navigation-window-ui.xml
 --- nautilus-2.24.2/src/nautilus-navigation-window-ui.xml	2008-10-06 19:22:18.000000000 +0200
 +++ ../nautilus-full-async/src/nautilus-navigation-window-ui.xml	2008-12-02 11:44:12.785181795 +0100
@@ -6930,9 +5218,8 @@
  		<separator/>
  		<placeholder name="Show Hide Placeholder"/>
  		<separator/>
-diff -x '*.out' -x '*.*~' -x '*.orig' -x '*.rej' -rupN nautilus-2.24.2/src/nautilus-window-manage-views.c ../nautilus-full-async/src/nautilus-window-manage-views.c
---- nautilus-2.24.2/src/nautilus-window-manage-views.c	2008-12-02 14:18:12.747717824 +0100
-+++ ../nautilus-full-async/src/nautilus-window-manage-views.c	2008-12-02 10:32:07.830871577 +0100
+--- /usr/tmp/nautilus-2.25.2/src/nautilus-window-manage-views.c	2008-10-17 15:49:49.000000000 +0100
++++ nautilus-2.25.2/src/nautilus-window-manage-views.c	2009-01-02 10:24:22.973666000 +0000
 @@ -40,6 +40,7 @@
  #include "nautilus-trash-bar.h"
  #include "nautilus-x-content-bar.h"
@@ -6941,15 +5228,15 @@
  #include <eel/eel-accessibility.h>
  #include <eel/eel-debug.h>
  #include <eel/eel-gdk-extensions.h>
-@@ -52,6 +53,7 @@
+@@ -51,6 +52,7 @@
  #include <gtk/gtk.h>
  #include <gdk/gdkx.h>
  #include <glib/gi18n.h>
 +#include <stdlib.h>
- #include <libgnomeui/gnome-icon-theme.h>
  #include <libnautilus-extension/nautilus-location-widget-provider.h>
  #include <libnautilus-private/nautilus-debug-log.h>
-@@ -619,9 +621,7 @@ nautilus_window_slot_open_location_full 
+ #include <libnautilus-private/nautilus-file-attributes.h>
+@@ -616,9 +619,7 @@
          if ((!do_load_location) ||
  	    (target_window == window && target_slot == slot &&
  	     old_location && g_file_equal (old_location, location))) {
@@ -6960,7 +5247,7 @@
                  return;
          }
  	
-@@ -804,6 +804,7 @@ begin_location_change (NautilusWindowSlo
+@@ -801,6 +802,7 @@
          NautilusFile *file;
  	gboolean force_reload;
          char *current_pos;
@@ -6968,7 +5255,7 @@
  
  	g_assert (slot != NULL);
          g_assert (location != NULL);
-@@ -817,6 +818,21 @@ begin_location_change (NautilusWindowSlo
+@@ -814,6 +816,21 @@
  
  	end_location_change (slot);
  
@@ -6990,7 +5277,7 @@
  	nautilus_window_slot_set_allow_stop (slot, TRUE);
  	nautilus_window_slot_set_status (slot, " ");
  
-@@ -833,6 +849,7 @@ begin_location_change (NautilusWindowSlo
+@@ -830,6 +847,7 @@
          
          directory = nautilus_directory_get (location);
  
@@ -6998,7 +5285,7 @@
  	/* The code to force a reload is here because if we do it
  	 * after determining an initial view (in the components), then
  	 * we end up fetching things twice.
-@@ -1075,8 +1092,15 @@ got_file_info_for_view_selection_callbac
+@@ -1072,8 +1090,15 @@
  		/* If fallback, don't use view from metadata */
  		if (slot->location_change_type != NAUTILUS_LOCATION_CHANGE_FALLBACK) {
  			/* Look in metadata for view */
@@ -7016,7 +5303,7 @@
  			if (view_id != NULL && 
  			    !nautilus_view_factory_view_supports_uri (view_id,
  								      location,
-@@ -1637,6 +1661,28 @@ update_for_new_location (NautilusWindowS
+@@ -1628,6 +1659,28 @@
  		/* Load menus from nautilus extensions for this location */
  		nautilus_window_load_extension_menus (window);
  	}
@@ -7045,7 +5332,7 @@
  
  	if (location_really_changed) {
  		nautilus_window_slot_remove_extra_location_widgets (slot);
-@@ -1968,12 +2014,20 @@ void
+@@ -1959,12 +2012,20 @@
  nautilus_window_slot_stop_loading (NautilusWindowSlot *slot)
  {
  	NautilusWindow *window;
@@ -7067,7 +5354,7 @@
  	if (slot->new_content_view != NULL) {
  		window->details->temporarily_ignore_view_signals = TRUE;
  		nautilus_view_stop_loading (slot->new_content_view);
-@@ -2035,6 +2089,8 @@ nautilus_window_manage_views_close_slot 
+@@ -2026,6 +2087,8 @@
  		nautilus_window_slot_disconnect_content_view (slot, slot->content_view);
  	}

--- a/patches/nautilus-14-interface-changes-indiana.diff	Wed Dec 31 08:04:35 2008 +0000
+++ b/patches/nautilus-14-interface-changes-indiana.diff	Fri Jan 02 14:01:43 2009 +0000
@@ -354,24 +354,6 @@
  TryExec=nautilus
  Exec=nautilus --no-desktop computer:
  Icon=computer
-diff -Nrup ../nautilus-2.23.90/nautilus.desktop.in.in nautilus-2.23.90/nautilus.desktop.in.in
---- ../nautilus-2.23.90/nautilus.desktop.in.in	2008-09-08 15:31:34.163695210 +0200
-+++ nautilus-2.23.90/nautilus.desktop.in.in	2008-09-08 15:33:17.077874435 +0200
-@@ -1,11 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
- _Name=File Browser
--_Comment=Browse the file system with the file manager
-+# SUN_BRANDING
-+_Comment=Browse files and folders with the file manager
- TryExec=nautilus
- Exec=nautilus --no-desktop --browser %U
- Icon=system-file-manager
- Terminal=false
-+NoDisplay=true
- StartupNotify=true
- Type=Application
- Categories=GNOME;GTK;System;Utility;Core;
 diff -Nrup ../nautilus-2.23.90/src/file-manager/fm-icon-container.c nautilus-2.23.90/src/file-manager/fm-icon-container.c
 --- ../nautilus-2.23.90/src/file-manager/fm-icon-container.c	2008-09-08 15:31:34.216470297 +0200
 +++ nautilus-2.23.90/src/file-manager/fm-icon-container.c	2008-09-08 15:33:17.079100940 +0200

--- a/patches/nautilus-14-interface-changes.diff	Wed Dec 31 08:04:35 2008 +0000
+++ b/patches/nautilus-14-interface-changes.diff	Fri Jan 02 14:01:43 2009 +0000
@@ -339,24 +339,6 @@
  TryExec=nautilus
  Exec=nautilus --no-desktop computer:
  Icon=computer
-diff -Nrup ../nautilus-2.23.90/nautilus.desktop.in.in nautilus-2.23.90/nautilus.desktop.in.in
---- ../nautilus-2.23.90/nautilus.desktop.in.in	2008-09-08 15:31:34.163695210 +0200
-+++ nautilus-2.23.90/nautilus.desktop.in.in	2008-09-08 15:31:43.172019126 +0200
-@@ -1,11 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
- _Name=File Browser
--_Comment=Browse the file system with the file manager
-+# SUN_BRANDING
-+_Comment=Browse files and folders with the file manager
- TryExec=nautilus
- Exec=nautilus --no-desktop --browser %U
- Icon=system-file-manager
- Terminal=false
-+NoDisplay=true
- StartupNotify=true
- Type=Application
- Categories=GNOME;GTK;System;Utility;Core;
 diff -Nrup ../nautilus-2.23.90/src/file-manager/fm-icon-container.c nautilus-2.23.90/src/file-manager/fm-icon-container.c
 --- ../nautilus-2.23.90/src/file-manager/fm-icon-container.c	2008-09-08 15:31:34.216470297 +0200
 +++ nautilus-2.23.90/src/file-manager/fm-icon-container.c	2008-09-08 15:31:43.173244098 +0200

author	padraig
	Fri, 02 Jan 2009 14:01:43 +0000
changeset 14836	bc662659c4ff
parent 14835	97d86a6f3bf4
child 14837	6425f29481dc

ChangeLog		file \| annotate \| diff \| comparison \| revisions
patches/nautilus-07-lockdown.diff		file \| annotate \| diff \| comparison \| revisions
patches/nautilus-09-trusted-extensions.diff		file \| annotate \| diff \| comparison \| revisions
patches/nautilus-10-star-desktop.diff		file \| annotate \| diff \| comparison \| revisions
patches/nautilus-13-zfs-snapshot.diff		file \| annotate \| diff \| comparison \| revisions
patches/nautilus-14-interface-changes-indiana.diff		file \| annotate \| diff \| comparison \| revisions
patches/nautilus-14-interface-changes.diff		file \| annotate \| diff \| comparison \| revisions