summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2011-01-13 23:51:01 -0500
committerRay Strode <rstrode@redhat.com>2011-01-18 17:42:52 -0500
commit2de401d1ff9740906c7ca0cb4a66685bd3afd7d8 (patch)
tree7a6cfcdbad31200aeb400d74b3298c1a6d452a2e
parent6fc47b08425e8faae63367d00ffbbe73e05dc94b (diff)
downloadgdm-2de401d1ff9740906c7ca0cb4a66685bd3afd7d8.tar.gz
The --gconf-prefix has been removed from g-s-d
https://bugzilla.gnome.org/show_bug.cgi?id=639284
-rw-r--r--data/greeter-autostart/gnome-settings-daemon.desktop.in.in2
-rw-r--r--gui/simple-chooser/gdm-chooser-session.c2
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 b4b31e13..324da223 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 c15f9864..da1e8963 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);