gnome-settings-daemon r475 - in trunk: . plugins/xsettings

[jensg svn gnome org]

Author: jensg
Date: Wed Aug 27 16:27:52 2008
New Revision: 475
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=475&view=rev

Log:
2008-08-27  Jens Granseuer  <jensgr gmx net>

	* plugins/xsettings/gsd-xsettings-manager.c:
	(setup_xsettings_managers): use g_warning instead of g_error when
	setup fails so we don't abort (bug #549483)


Modified:
   trunk/ChangeLog
   trunk/plugins/xsettings/gsd-xsettings-manager.c

Modified: trunk/plugins/xsettings/gsd-xsettings-manager.c
==============================================================================
--- trunk/plugins/xsettings/gsd-xsettings-manager.c	(original)
+++ trunk/plugins/xsettings/gsd-xsettings-manager.c	Wed Aug 27 16:27:52 2008
@@ -694,7 +694,7 @@
         res = xsettings_manager_check_running (gdk_x11_display_get_xdisplay (display),
                                                gdk_screen_get_number (gdk_screen_get_default ()));
         if (res) {
-                g_error ("You can only run one xsettings manager at a time; exiting");
+                g_warning ("You can only run one xsettings manager at a time; exiting");
                 return FALSE;
         }
 
@@ -711,7 +711,7 @@
                                                                      terminate_cb,
                                                                      &terminated);
                 if (! manager->priv->managers [i]) {
-                        g_error ("Could not create xsettings manager for screen %d!", i);
+                        g_warning ("Could not create xsettings manager for screen %d!", i);
                         return FALSE;
                 }
         }
@@ -748,7 +748,7 @@
                                         &err);
 
                 if (err != NULL) {
-                        g_warning ("Error getting value for %s: %s\n",
+                        g_warning ("Error getting value for %s: %s",
                                    translations[i].gconf_key,
                                    err->message);
                         g_error_free (err);