diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-03-19 16:08:05 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-03-19 16:08:05 -0500 |
| commit | 84d8aaefa440914810a94a6e19371b2b1fff8fe6 (patch) | |
| tree | 5ba01ac5819c5d239cbdcb3ce54d1860e5f90379 /src | |
| parent | f95bf78035fd4e550a67b74e902c0c2ba7df15bc (diff) | |
| parent | 36f65c70ce8184970eff9ac480a95299b98e7d86 (diff) | |
| download | libayatana-appindicator-84d8aaefa440914810a94a6e19371b2b1fff8fe6.tar.gz libayatana-appindicator-84d8aaefa440914810a94a6e19371b2b1fff8fe6.tar.bz2 libayatana-appindicator-84d8aaefa440914810a94a6e19371b2b1fff8fe6.zip | |
merge lp:~charlesk/libappindicator/lp-957471 to fix a PW.BRANCH_PAST_INITIALIZATION error reported by Coverity in bug #957471
Diffstat (limited to 'src')
| -rw-r--r-- | src/app-indicator.c | 7 |
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: |