Merge lp:~charlesk/indicator-applet/fix-937435 into lp:indicator-applet/0.5

Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 394
Merged at revision: 394
Proposed branch: lp:~charlesk/indicator-applet/fix-937435
Merge into: lp:indicator-applet/0.5
Diff against target: 17 lines (+3/-3)
1 file modified
src/applet-main.c (+3/-3)
To merge this branch: bzr merge lp:~charlesk/indicator-applet/fix-937435
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Lars Karlitski Pending
Review via email: mp+94005@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Looks good.

  review approve
  status approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/applet-main.c'
2--- src/applet-main.c 2011-11-26 01:51:46 +0000
3+++ src/applet-main.c 2012-02-21 15:22:26 +0000
4@@ -536,10 +536,10 @@
5
6 if (entry == NULL) {
7 /* Close any open menus instead of opening one */
8+ GList * l;
9 GList * entries = indicator_object_get_entries(io);
10- GList * entry = NULL;
11- for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
12- IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
13+ for (l = entries; l != NULL; l = g_list_next(entry)) {
14+ IndicatorObjectEntry * entrydata = l->data;
15 gtk_menu_popdown(entrydata->menu);
16 }
17 g_list_free(entries);

Subscribers

People subscribed via source and target branches