Ubuntu One Client

Merge lp:~chrisccoulson/ubuntuone-client/lp767825-stable-1-6 into lp:ubuntuone-client/stable-1-6

  1. lp767825-stable-1-6
  2. Merge into stable-1-6
Proposed by Chris Coulson
Status: Merged
Approved by: Stuart Langridge
Approved revision: 962
Merged at revision: 962
Proposed branch: lp:~chrisccoulson/ubuntuone-client/lp767825-stable-1-6
Merge into: lp:ubuntuone-client/stable-1-6
Diff against target: 20 lines (+4/-4)
1 file modified
nautilus/utils.c (+4/-4)
To merge this branch: bzr merge lp:~chrisccoulson/ubuntuone-client/lp767825-stable-1-6
Reviewer Review Type Date Requested Status
Stuart Langridge (community) Approve
dobey (community) Approve
Review via email: mp+58684@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Stuart Langridge (sil) wrote :

This approval brought to you by the society for always using braces in if statements.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/utils.c'
2--- nautilus/utils.c 2011-02-11 15:24:48 +0000
3+++ nautilus/utils.c 2011-04-21 14:27:28 +0000
4@@ -176,12 +176,12 @@
5 show_location_value = gconf_client_get (conf_client, EXPANDER_SHOWN_KEY, NULL);
6 g_object_unref (conf_client);
7
8- if (show_location_value == NULL)
9+ if (show_location_value == NULL) {
10 show_location = TRUE;
11- else
12+ } else {
13 show_location = gconf_value_get_bool (show_location_value);
14-
15- gconf_value_free (show_location_value);
16+ gconf_value_free (show_location_value);
17+ }
18
19 return show_location;
20 }

Subscribers

People subscribed via source and target branches