Merge lp:~chrisccoulson/ubuntuone-client/lp767825 into lp:ubuntuone-client

[Chris Coulson]

Don't try to free a GConfValue where the value doesn't exist

Don't try to free a GConfValue where the value doesn't exist. Fixes errors been logged to ~/.xsession-errors

[Roman Yepishev (rye)]

After the patch is applied there are no more "gconf_value_free: assertion" messages.

review: Approve (fieldtest)

[dobey (dobey)]

Looks ok to me, though the addition of the {} before the else are unnecessary.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Chris Coulson <email address hidden>

=== modified file 'nautilus/utils.c'
--- nautilus/utils.c	2011-02-11 15:24:48 +0000
+++ nautilus/utils.c	2011-04-20 22:57:30 +0000
@@ -176,12 +176,12 @@
 	show_location_value = gconf_client_get (conf_client, EXPANDER_SHOWN_KEY, NULL);
 	g_object_unref (conf_client);
 
-	if (show_location_value == NULL)
+	if (show_location_value == NULL) {
 		show_location = TRUE;
-	else
+	} else {
 		show_location = gconf_value_get_bool (show_location_value);
-
-	gconf_value_free (show_location_value);
+		gconf_value_free (show_location_value);
+	}
 
 	return show_location;
 }