Merge lp:~3v1n0/indicator-appmenu/use-bamf-0.5.2 into lp:indicator-appmenu/15.10

[Marco Trevisan (Treviño)]

IndicatorAppmenu: depend on bamf 0.5.2 and use new API

[Andrea Azzarone (azzar1)]

Approve.

[lp:~3v1n0/indicator-appmenu/use-bamf-0.5.2]

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

debian/control: depend on libbamf 0.5.2~bzr0

=== modified file 'configure.ac'
--- configure.ac	2015-06-02 19:18:23 +0000
+++ configure.ac	2015-10-28 16:49:42 +0000
@@ -62,7 +62,7 @@
 GTK_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.90
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
-BAMF_REQUIRED_VERSION=0.2.53
+BAMF_REQUIRED_VERSION=0.5.2
 
 PKG_CHECK_MODULES(gtk, gtk+-3.0 >= $GTK_REQUIRED_VERSION)
 PKG_CHECK_MODULES(INDICATOR,  glib-2.0 >= $GLIB_REQUIRED_VERSION
 
=== modified file 'debian/control'
--- debian/control	2015-01-20 22:02:08 +0000
+++ debian/control	2015-10-28 16:49:42 +0000
@@ -15,7 +15,7 @@
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libdbusmenu-jsonloader-dev (>= 0.5.90),
-               libbamf3-dev (>= 0.2.53),
+               libbamf3-dev (>= 0.5.2~bzr0),
                libappindicator3-dev,
                indicator-application (>= 0.4.90),
 Standards-Version: 3.9.2
 
=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2015-10-01 17:03:20 +0000
+++ src/indicator-appmenu.c	2015-10-28 16:49:42 +0000
@@ -804,10 +804,14 @@
 static BamfWindow *
 xid_to_bamf_window (IndicatorAppmenu * iapp, guint xid)
 {
+	BamfWindow * newwindow = bamf_matcher_get_window_for_xid(iapp->matcher, xid);
+
+	if (BAMF_IS_WINDOW(newwindow))
+		return newwindow;
+
 	BamfApplication *application = bamf_matcher_get_application_for_xid(iapp->matcher, xid);
-	GList * children = bamf_view_get_children (BAMF_VIEW (application));
+	GList * children = bamf_view_peek_children (BAMF_VIEW (application));
 	GList * l;
-	BamfWindow * newwindow = NULL;
 
 	for (l = children; l; l = l->next) {
 		if (!BAMF_IS_WINDOW(l->data)) {
@@ -821,7 +825,6 @@
 			break;
 		}
 	}
-	g_list_free(children);
 
 	return newwindow;
 }