gnome-settings-daemon r128 - in trunk: . gnome-settings-daemon

[jensg svn gnome org]

Author: jensg
Date: Sun Feb 10 09:40:44 2008
New Revision: 128
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=128&view=rev

Log:
2008-02-10  Jens Granseuer  <jensgr gmx net>

	* gnome-settings-daemon/main.c: update the default GConf prefix to
	match the changes from r112 or bug #514411


Modified:
   trunk/ChangeLog
   trunk/gnome-settings-daemon/main.c

Modified: trunk/gnome-settings-daemon/main.c
==============================================================================
--- trunk/gnome-settings-daemon/main.c	(original)
+++ trunk/gnome-settings-daemon/main.c	Sun Feb 10 09:40:44 2008
@@ -37,14 +37,14 @@
 
 #define GSD_DBUS_NAME         "org.gnome.SettingsDaemon"
 
-#define DEFAULT_GCONF_PREFIX "/apps/gnome-settings-daemon/plugins"
+#define DEFAULT_GCONF_PREFIX "/apps/gnome_settings_daemon/plugins"
 #define GCONF_PREFIX_ENV     "GNOME_SETTINGS_DAEMON_GCONF_PREFIX"
 
 static char      *gconf_prefix = NULL;
 static gboolean   no_daemon    = TRUE;
 
 static GOptionEntry entries[] = {
-        { "no-daemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Don't become a daemon"), NULL },
+        {"no-daemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Don't become a daemon"), NULL },
         {"gconf-prefix", 0, 0, G_OPTION_ARG_STRING, &gconf_prefix, "GConf prefix from which to load plugin settings", NULL},
         {NULL}
 };