[gdm] The --gconf-prefix has been removed from g-s-d

[Ray Strode <halfline src gnome org>]

commit 2de401d1ff9740906c7ca0cb4a66685bd3afd7d8
Author: William Jon McCann <jmccann redhat com>
Date:   Thu Jan 13 23:51:01 2011 -0500

    The --gconf-prefix has been removed from g-s-d
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639284

 .../gnome-settings-daemon.desktop.in.in            |    2 +-
 gui/simple-chooser/gdm-chooser-session.c           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
index b4b31e1..324da22 100644
--- a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+++ b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=GNOME Settings Daemon
 TryExec= LIBEXECDIR@/gnome-settings-daemon
-Exec= LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
+Exec= LIBEXECDIR@/gnome-settings-daemon
 OnlyShowIn=GNOME;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-Autostart-Notify=true
diff --git a/gui/simple-chooser/gdm-chooser-session.c b/gui/simple-chooser/gdm-chooser-session.c
index c15f986..da1e896 100644
--- a/gui/simple-chooser/gdm-chooser-session.c
+++ b/gui/simple-chooser/gdm-chooser-session.c
@@ -131,7 +131,7 @@ start_settings_daemon (GdmChooserSession *session)
         ret = FALSE;
 
         error = NULL;
-        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
+        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
         if (error != NULL) {
                 g_warning ("Error starting settings daemon: %s", error->message);
                 g_error_free (error);