Based on patch by Alex Larsson

Mon Mar  1 14:16:52 2004  Owen Taylor  <otaylor@redhat.com>

        Based on patch by Alex Larsson

        * gtk/gtkfilechooserdefault.c: Use gtk-file-chooser-backend
        GtkSetting to set the backend if the app doesn't specify one.

        * gdk/x11/gdkevents-x11.c gtk/gtksettings.c:
        Add Gtk/FileChooserBackend.

ChangeLog

@@ -1,3 +1,13 @@
+Mon Mar  1 14:16:52 2004  Owen Taylor  <otaylor@redhat.com>
+
+	Based on patch by Alex Larsson
+
+	* gtk/gtkfilechooserdefault.c: Use gtk-file-chooser-backend
+	GtkSetting to set the backend if the app doesn't specify one.
+
+	* gdk/x11/gdkevents-x11.c gtk/gtksettings.c:
+	Add Gtk/FileChooserBackend.
+
 Mon Mar  1 20:32:06 2004  Tim Janik  <timj@gtk.org>
 
         * autogen.sh:

ChangeLog.pre-2-10

@@ -1,3 +1,13 @@
+Mon Mar  1 14:16:52 2004  Owen Taylor  <otaylor@redhat.com>
+
+	Based on patch by Alex Larsson
+
+	* gtk/gtkfilechooserdefault.c: Use gtk-file-chooser-backend
+	GtkSetting to set the backend if the app doesn't specify one.
+
+	* gdk/x11/gdkevents-x11.c gtk/gtksettings.c:
+	Add Gtk/FileChooserBackend.
+
 Mon Mar  1 20:32:06 2004  Tim Janik  <timj@gtk.org>
 
         * autogen.sh:

ChangeLog.pre-2-4

@@ -1,3 +1,13 @@
+Mon Mar  1 14:16:52 2004  Owen Taylor  <otaylor@redhat.com>
+
+	Based on patch by Alex Larsson
+
+	* gtk/gtkfilechooserdefault.c: Use gtk-file-chooser-backend
+	GtkSetting to set the backend if the app doesn't specify one.
+
+	* gdk/x11/gdkevents-x11.c gtk/gtksettings.c:
+	Add Gtk/FileChooserBackend.
+
 Mon Mar  1 20:32:06 2004  Tim Janik  <timj@gtk.org>
 
         * autogen.sh:

ChangeLog.pre-2-6

@@ -1,3 +1,13 @@
+Mon Mar  1 14:16:52 2004  Owen Taylor  <otaylor@redhat.com>
+
+	Based on patch by Alex Larsson
+
+	* gtk/gtkfilechooserdefault.c: Use gtk-file-chooser-backend
+	GtkSetting to set the backend if the app doesn't specify one.
+
+	* gdk/x11/gdkevents-x11.c gtk/gtksettings.c:
+	Add Gtk/FileChooserBackend.
+
 Mon Mar  1 20:32:06 2004  Tim Janik  <timj@gtk.org>
 
         * autogen.sh:

ChangeLog.pre-2-8

@@ -1,3 +1,13 @@
+Mon Mar  1 14:16:52 2004  Owen Taylor  <otaylor@redhat.com>
+
+	Based on patch by Alex Larsson
+
+	* gtk/gtkfilechooserdefault.c: Use gtk-file-chooser-backend
+	GtkSetting to set the backend if the app doesn't specify one.
+
+	* gdk/x11/gdkevents-x11.c gtk/gtksettings.c:
+	Add Gtk/FileChooserBackend.
+
 Mon Mar  1 20:32:06 2004  Tim Janik  <timj@gtk.org>
 
         * autogen.sh:

gdk/x11/gdkevents-x11.c

@@ -2632,6 +2632,7 @@ static struct
   { "Net/CursorBlinkTime", "gtk-cursor-blink-time" },
   { "Net/ThemeName", "gtk-theme-name" },
   { "Net/IconThemeName", "gtk-icon-theme-name" },
+  { "Gtk/FileChooserBackend", "gtk-file-chooser-backend" },
   { "Gtk/ButtonImages", "gtk-button-images" },
   { "Gtk/MenuImages", "gtk-menu-images" },
   { "Xft/Antialias", "gtk-xft-antialias" },

gtk/gtkfilechooserdefault.c

@@ -455,6 +455,12 @@ gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
 				0);
 
   _gtk_file_chooser_install_properties (gobject_class);
+  
+  gtk_settings_install_property (g_param_spec_string ("gtk-file-chooser-backend",
+						      P_("Default file chooser backend"),
+						      P_("Name of the GtkFileChooser backend to use by default"),
+						      NULL,
+						      G_PARAM_READWRITE));
 }
 
 static void
@@ -2059,6 +2065,18 @@ set_file_system_backend (GtkFileChooserDefault *impl,
   impl->file_system = NULL;
   if (backend)
     impl->file_system = _gtk_file_system_create (backend);
+  else
+    {
+      GtkSettings *settings = gtk_settings_get_default ();
+      gchar *default_backend = NULL;
+      
+      g_object_get (settings, "gtk-file-chooser-backend", &default_backend, NULL);
+      if (default_backend)
+	{
+	  impl->file_system = _gtk_file_system_create (default_backend);
+	  g_free (default_backend);
+	}
+    }
 
   if (!impl->file_system)
     {

gtk/gtksettings.c

@@ -312,7 +312,8 @@ gtk_settings_class_init (GtkSettingsClass *class)
 								  "hicolor",
 								  G_PARAM_READWRITE),
                                              NULL);
-  g_assert (result == PROP_ICON_THEME_NAME);    
+  g_assert (result == PROP_ICON_THEME_NAME);
+  
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-key-theme-name",
 								  P_("Key Theme Name"),