libindicator

Merge lp:~charlesk/libindicator/fix-939061 into lp:libindicator/0.5

  1. fix-939061
  2. Merge into trunk.0.5
Proposed by Charles Kerr
Status: Merged
Merge reported by: Charles Kerr
Merged at revision: not available
Proposed branch: lp:~charlesk/libindicator/fix-939061
Merge into: lp:libindicator/0.5
Diff against target: 28 lines (+3/-8)
1 file modified
libindicator/indicator-object.c (+3/-8)
To merge this branch: bzr merge lp:~charlesk/libindicator/fix-939061
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+95262@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicator/indicator-object.c'
2--- libindicator/indicator-object.c 2012-02-22 18:18:01 +0000
3+++ libindicator/indicator-object.c 2012-02-29 21:07:21 +0000
4@@ -464,21 +464,16 @@
5 goto unrefandout;
6 }
7
8- IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object);
9 /* Now we can track the module */
10- priv->module = module;
11+ INDICATOR_OBJECT_GET_PRIVATE(object)->module = module;
12
13 return INDICATOR_OBJECT(object);
14
15 /* Error, let's drop the object and return NULL. Sad when
16 this happens. */
17 unrefandout:
18- if (object != NULL) {
19- g_object_unref(object);
20- }
21- if (module != NULL) {
22- g_object_unref(module);
23- }
24+ g_clear_object (&object);
25+ g_clear_object (&module);
26 g_warning("Error building IndicatorObject from file: %s", file);
27 return NULL;
28 }

Subscribers

People subscribed via source and target branches