aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-03-21 16:25:18 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-03-21 16:25:18 -0500
commit3aa2827ef25c9695a9b32d9976fe2dac59123f62 (patch)
tree4878c3285b5654b40349917efade1d15cb841a0a /src
parent03fa0726e8a97ef12f56c470dfa2b20ac72d0940 (diff)
parent812ded8224978f47453e53eb63fc11c754bac0c6 (diff)
downloadlibayatana-appindicator-3aa2827ef25c9695a9b32d9976fe2dac59123f62.tar.gz
libayatana-appindicator-3aa2827ef25c9695a9b32d9976fe2dac59123f62.tar.bz2
libayatana-appindicator-3aa2827ef25c9695a9b32d9976fe2dac59123f62.zip
* New upstream release.
* Fix a Coverity PW.BRANCH_PAST_INITIALIZATION error (LP: #957471) * Fix FTB bug from ambiguity between Glib.Menu and Gtk.Menu in the Vala code
Diffstat (limited to 'src')
-rw-r--r--src/app-indicator.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index d7b3d18..0d6450c 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -926,11 +926,8 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
break;
case PROP_DBUS_MENU_SERVER:
- if (priv->menuservice != NULL) {
- g_object_unref (priv->menuservice);
- }
- gpointer val = g_value_dup_object(value);
- priv->menuservice = DBUSMENU_SERVER(val);
+ g_clear_object (&priv->menuservice);
+ priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value));
break;
default: