~charlesk/libappindicator/lp-1083425

« back to all changes in this revision

Viewing changes to src/app-indicator.c

  • Committer: Charles Kerr
  • Date: 2012-03-19 21:08:05 UTC
  • mfrom: (235.1.1 trunk)
  • Revision ID: charles.kerr@canonical.com-20120319210805-gyqyl3pum2qhmvr1
merge lp:~charlesk/libappindicator/lp-957471 to fix a PW.BRANCH_PAST_INITIALIZATION error reported by Coverity in bug #957471

Show diffs side-by-side

added added

removed removed

Lines of Context:
926
926
                  break;
927
927
 
928
928
                case PROP_DBUS_MENU_SERVER:
929
 
                        if (priv->menuservice != NULL) {
930
 
                                g_object_unref (priv->menuservice);
931
 
                        }
932
 
                        gpointer val = g_value_dup_object(value);
933
 
                        priv->menuservice = DBUSMENU_SERVER(val);
 
929
                        g_clear_object (&priv->menuservice);
 
930
                        priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value));
934
931
                        break;
935
932
 
936
933
        default: