libappindicator

Merge lp:~charlesk/libappindicator/lp-957471 into lp:libappindicator/0.5

  1. lp-957471
  2. Merge into trunk.0.5
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 236
Merged at revision: 236
Proposed branch: lp:~charlesk/libappindicator/lp-957471
Merge into: lp:libappindicator/0.5
Diff against target: 17 lines (+2/-5)
1 file modified
src/app-indicator.c (+2/-5)
To merge this branch: bzr merge lp:~charlesk/libappindicator/lp-957471
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+98009@code.launchpad.net

Description of the change

Remove the local variable "val" which was declared inside the case clause of a switch statement. It was apparently supposed to be a temporary, but gained larger scope by accident because the braces were omitted from the case statement.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app-indicator.c'
2--- src/app-indicator.c 2012-03-07 13:44:01 +0000
3+++ src/app-indicator.c 2012-03-16 22:20:25 +0000
4@@ -926,11 +926,8 @@
5 break;
6
7 case PROP_DBUS_MENU_SERVER:
8- if (priv->menuservice != NULL) {
9- g_object_unref (priv->menuservice);
10- }
11- gpointer val = g_value_dup_object(value);
12- priv->menuservice = DBUSMENU_SERVER(val);
13+ g_clear_object (&priv->menuservice);
14+ priv->menuservice = DBUSMENU_SERVER (g_value_dup_object(value));
15 break;
16
17 default:

Subscribers

People subscribed via source and target branches