diff options
| author | Ted Gould <ted@gould.cx> | 2012-03-08 16:57:20 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-03-08 16:57:20 -0600 |
| commit | 3c12ac558602ec74e99cde48ddc6e59ea62cc6aa (patch) | |
| tree | 1f5963d3de20cf696660c1f601f51a4d73f3c16e /src/datetime-interface.c | |
| parent | ade1e121d41dd07ccc81a641862d81798e38b145 (diff) | |
| parent | b5c19e04a9b46cfe5f14110a307d37d77cfe29da (diff) | |
| download | ayatana-indicator-datetime-3c12ac558602ec74e99cde48ddc6e59ea62cc6aa.tar.gz ayatana-indicator-datetime-3c12ac558602ec74e99cde48ddc6e59ea62cc6aa.tar.bz2 ayatana-indicator-datetime-3c12ac558602ec74e99cde48ddc6e59ea62cc6aa.zip | |
* New upstream release.
* Make GSettings readonly to fix DConf service starting on boot
* Explicitly give types to GVariant Builder
* Confirm scanf usage for Coverity (LP: #943747)
* Remove unused code (LP: #943746)
* Fix timezone ordering in the menu (LP: #833325, LP: #833337)
Diffstat (limited to 'src/datetime-interface.c')
| -rw-r--r-- | src/datetime-interface.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/datetime-interface.c b/src/datetime-interface.c index 5939061..e67be85 100644 --- a/src/datetime-interface.c +++ b/src/datetime-interface.c @@ -124,10 +124,7 @@ bus_get_cb (GObject * object, GAsyncResult * res, gpointer user_data) g_warn_if_fail(priv->bus == NULL); priv->bus = connection; - if (priv->bus_cancel != NULL) { - g_object_unref(priv->bus_cancel); - priv->bus_cancel = NULL; - } + g_clear_object (&priv->bus_cancel); /* Now register our object on our new connection */ priv->dbus_registration = g_dbus_connection_register_object(priv->bus, @@ -158,15 +155,11 @@ datetime_interface_dispose (GObject *object) priv->dbus_registration = 0; } - if (priv->bus != NULL) { - g_object_unref(priv->bus); - priv->bus = NULL; - } + g_clear_object (&priv->bus); if (priv->bus_cancel != NULL) { g_cancellable_cancel(priv->bus_cancel); - g_object_unref(priv->bus_cancel); - priv->bus_cancel = NULL; + g_clear_object (&priv->bus_cancel); } G_OBJECT_CLASS (datetime_interface_parent_class)->dispose (object); |