aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-object.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-03-07 14:08:40 -0600
committerTed Gould <ted@gould.cx>2012-03-07 14:08:40 -0600
commit67872e2808a7c4f4d414822198e4a3f951bdf411 (patch)
treeec6847f736a6188a06557a516de5b16ba5c6fb0d /libindicator/indicator-object.c
parent169093d37a32b8019211dd998a6b1ec2df68e450 (diff)
parent18d670b206e2c4292451cb17602d209a628a7e21 (diff)
downloadlibayatana-indicator-67872e2808a7c4f4d414822198e4a3f951bdf411.tar.gz
libayatana-indicator-67872e2808a7c4f4d414822198e4a3f951bdf411.tar.bz2
libayatana-indicator-67872e2808a7c4f4d414822198e4a3f951bdf411.zip
Import upstream version 0.4.93
Diffstat (limited to 'libindicator/indicator-object.c')
-rw-r--r--libindicator/indicator-object.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index 17a6d1d..ca821af 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -464,21 +464,16 @@ indicator_object_new_from_file (const gchar * file)
goto unrefandout;
}
- IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object);
/* Now we can track the module */
- priv->module = module;
+ INDICATOR_OBJECT_GET_PRIVATE(object)->module = module;
return INDICATOR_OBJECT(object);
/* Error, let's drop the object and return NULL. Sad when
this happens. */
unrefandout:
- if (object != NULL) {
- g_object_unref(object);
- }
- if (module != NULL) {
- g_object_unref(module);
- }
+ g_clear_object (&object);
+ g_clear_object (&module);
g_warning("Error building IndicatorObject from file: %s", file);
return NULL;
}