[tracker/gconf-dbus] libtracker-common: Cleaning up, indentation

[Philip Van Hoof <pvanhoof src gnome org>]

commit e2c768af3b7fb372d15fd2687457f678efc7272d
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Apr 1 17:29:46 2011 +0200

    libtracker-common: Cleaning up, indentation

 src/libtracker-common/tracker-locale-gconfdbus.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/libtracker-common/tracker-locale-gconfdbus.c b/src/libtracker-common/tracker-locale-gconfdbus.c
index 75f7c08..9e71206 100644
--- a/src/libtracker-common/tracker-locale-gconfdbus.c
+++ b/src/libtracker-common/tracker-locale-gconfdbus.c
@@ -30,7 +30,7 @@
 
 /* This helps with testing, change all the names in gconf-dbus and then you
  * can run it in parallel with an upstream gconf-d of the GNOME platform */
-#define GCONF_DBUS_NAME "GConf"
+#define GCONF_DBUS_NAME "GConfDBus"
 
 #define GCONF_DBUS_SERVICE                    "org.gnome." GCONF_DBUS_NAME
 #define GCONF_DBUS_SERVER_INTERFACE           "org.gnome." GCONF_DBUS_NAME ".Server"
@@ -127,13 +127,14 @@ handle_method_call (GDBusConnection       *connection,
 	/* Takes place in mainloop */
 
 	if (g_strcmp0 (method_name, "Notify") == 0) {
-		const gchar *key, *value, *schema, *database, *namespace_name;
+		const gchar *key = NULL, *value = NULL;
+		const gchar *schema = NULL, *database = NULL;
+		const gchar *namespace_name = NULL;
 		gboolean is_set, is_default, is_writable;
 		gint type, i;
 		GSList *li;
 
 		if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(ss(s(is)bsbb))"))) {
-
 			g_variant_get (parameters, "(&s&s(&s(i&s)b&sbb))",
 			               &database, &namespace_name,
 			               &key, &type, &value,
@@ -159,6 +160,7 @@ handle_method_call (GDBusConnection       *connection,
 				g_warning ("Locale value for '%s' cannot be NULL, not changing %s",
 				           gconf_locales[i],
 				           tracker_locale_get_name (i));
+				return;
 			}
 
 			/* This always runs from mainloop, so no need for a lock other than
@@ -282,7 +284,6 @@ tracker_locale_gconfdbus_init (void)
 		GError *error = NULL;
 		GVariant *reply;
 		guint i;
-
 		GDBusInterfaceVTable interface_vtable = {
 			handle_method_call,
 			handle_get_property,
@@ -296,7 +297,6 @@ tracker_locale_gconfdbus_init (void)
 		if (error) {
 			g_critical ("%s", error->message);
 			g_clear_error (&error);
-
 			return;
 		}
 
@@ -334,7 +334,7 @@ tracker_locale_gconfdbus_init (void)
 		}
 
 		registration_id =
-				g_dbus_connection_register_object (connection,
+			g_dbus_connection_register_object (connection,
 			                                   GCONF_DBUS_CLIENT_OBJECT,
 			                                   introspection_data->interfaces[0],
 			                                   &interface_vtable,