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

[jensg svn gnome org]

Author: jensg
Date: Fri Feb 29 17:56:22 2008
New Revision: 185
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=185&view=rev

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

	* gnome-settings-daemon/gnome-settings-manager.c:
	(register_manager), (gnome_settings_manager_start): minor clean-up


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

Modified: trunk/gnome-settings-daemon/gnome-settings-manager.c
==============================================================================
--- trunk/gnome-settings-daemon/gnome-settings-manager.c	(original)
+++ trunk/gnome-settings-daemon/gnome-settings-manager.c	Fri Feb 29 17:56:22 2008
@@ -274,7 +274,6 @@
 {
         GError *error = NULL;
 
-        error = NULL;
         manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
         if (manager->priv->connection == NULL) {
                 if (error != NULL) {
@@ -293,8 +292,6 @@
 gnome_settings_manager_start (GnomeSettingsManager *manager,
                               GError              **error)
 {
-        gboolean ret;
-
         g_debug ("Starting settings manager");
 
         if (!g_module_supported ()) {
@@ -302,15 +299,14 @@
                 g_set_error (error,
                              GNOME_SETTINGS_MANAGER_ERROR,
                              GNOME_SETTINGS_MANAGER_ERROR_GENERAL,
-                             "%s", "Plugins not supported");
+                             "Plugins not supported");
 
                 return FALSE;
         }
 
         _load_all (manager);
 
-        ret = TRUE;
-        return ret;
+        return TRUE;
 }
 
 gboolean