Merge lp:~3v1n0/indicator-appmenu/per-window-showmenu+leak-fix into lp:indicator-appmenu/15.10

[Marco Trevisan (Treviño)]

IndicatorAppmenu: only emit snow-now-changed signal for menus belonging to the window that requested

Also fix a memory leak we had (entries list had to be free'd)

[Andrea Azzarone (azzar1)]

review: Approve

[lp:~3v1n0/indicator-appmenu/per-window-showmenu+leak-fix]

276. By Marco Trevisan (Treviño) on 2015-10-01

IndicatorAppmenu: only emit snow-now-changed signal for menus belonging to the window that requested

Also fix a memory leak we had (entries list had to be free'd)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/indicator-appmenu-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-wily-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-wily-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-appmenu-ci/28/rebuild

review: Approve (continuous-integration)

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2015-06-01 17:44:58 +0000
+++ src/indicator-appmenu.c	2015-10-01 17:03:40 +0000
@@ -1371,14 +1371,13 @@
 window_status_changed (WindowMenu * mw, DbusmenuStatus status, IndicatorAppmenu * iapp)
 {
 	gboolean show_now = (status == DBUSMENU_STATUS_NOTICE);
-	GList * entry_head, * entries;
-
-	entry_head = indicator_object_get_entries(INDICATOR_OBJECT(iapp));
-
-	for (entries = entry_head; entries != NULL; entries = g_list_next(entries)) {
-		IndicatorObjectEntry * entry = (IndicatorObjectEntry *)entries->data;
+	GList * l, * window_entries = window_menu_get_entries(mw);
+
+	for (l = window_entries; l; l = l->next) {
+		IndicatorObjectEntry * entry = l->data;
 		g_signal_emit(G_OBJECT(iapp), INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED_ID, 0, entry, show_now);
 	}
+	g_list_free (window_entries);
 }
 
 /* Pass up the show menu event */