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

Proposed by Marco Trevisan (Treviño) on 2015-10-28
Status: Merged
Approved by: Andrea Azzarone on 2015-10-28
Approved revision: 275
Merged at revision: 275
Proposed branch: lp:~3v1n0/indicator-appmenu/use-bamf-0.5.2
Merge into: lp:indicator-appmenu/15.10
Diff against target: 54 lines (+8/-5)
3 files modified
configure.ac (+1/-1)
debian/control (+1/-1)
src/indicator-appmenu.c (+6/-3)
To merge this branch: bzr merge lp:~3v1n0/indicator-appmenu/use-bamf-0.5.2
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2015-10-28 Pending
Review via email: mp+276014@code.launchpad.net

Commit message

IndicatorAppmenu: depend on bamf 0.5.2 and use new API

To post a comment you must log in.
Andrea Azzarone (azzar1) wrote :

Approve.

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

debian/control: depend on libbamf 0.5.2~bzr0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2015-06-02 19:18:23 +0000
3+++ configure.ac 2015-10-28 16:49:42 +0000
4@@ -62,7 +62,7 @@
5 GTK_REQUIRED_VERSION=3.0
6 INDICATOR_REQUIRED_VERSION=0.3.90
7 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
8-BAMF_REQUIRED_VERSION=0.2.53
9+BAMF_REQUIRED_VERSION=0.5.2
10
11 PKG_CHECK_MODULES(gtk, gtk+-3.0 >= $GTK_REQUIRED_VERSION)
12 PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION
13
14=== modified file 'debian/control'
15--- debian/control 2015-01-20 22:02:08 +0000
16+++ debian/control 2015-10-28 16:49:42 +0000
17@@ -15,7 +15,7 @@
18 libdbusmenu-glib-dev (>= 0.5.90),
19 libdbusmenu-gtk3-dev (>= 0.5.90),
20 libdbusmenu-jsonloader-dev (>= 0.5.90),
21- libbamf3-dev (>= 0.2.53),
22+ libbamf3-dev (>= 0.5.2~bzr0),
23 libappindicator3-dev,
24 indicator-application (>= 0.4.90),
25 Standards-Version: 3.9.2
26
27=== modified file 'src/indicator-appmenu.c'
28--- src/indicator-appmenu.c 2015-10-01 17:03:20 +0000
29+++ src/indicator-appmenu.c 2015-10-28 16:49:42 +0000
30@@ -804,10 +804,14 @@
31 static BamfWindow *
32 xid_to_bamf_window (IndicatorAppmenu * iapp, guint xid)
33 {
34+ BamfWindow * newwindow = bamf_matcher_get_window_for_xid(iapp->matcher, xid);
35+
36+ if (BAMF_IS_WINDOW(newwindow))
37+ return newwindow;
38+
39 BamfApplication *application = bamf_matcher_get_application_for_xid(iapp->matcher, xid);
40- GList * children = bamf_view_get_children (BAMF_VIEW (application));
41+ GList * children = bamf_view_peek_children (BAMF_VIEW (application));
42 GList * l;
43- BamfWindow * newwindow = NULL;
44
45 for (l = children; l; l = l->next) {
46 if (!BAMF_IS_WINDOW(l->data)) {
47@@ -821,7 +825,6 @@
48 break;
49 }
50 }
51- g_list_free(children);
52
53 return newwindow;
54 }

Subscribers

People subscribed via source and target branches