Unity

Merge lp:~bregma/unity/lp-1077937 into lp:unity

  1. lp-1077937
  2. Merge into trunk
Proposed by Stephen M. Webb on 2012-11-12
Status: Merged
Approved by: Francis Ginther on 2012-11-12
Approved revision: 2890
Merged at revision: 2892
Proposed branch: lp:~bregma/unity/lp-1077937
Merge into: lp:unity
Diff against target: 74 lines (+7/-7)
3 files modified
hud/HudController.cpp (+1/-1)
launcher/ApplicationLauncherIcon.cpp (+5/-5)
panel/PanelMenuView.cpp (+1/-1)
To merge this branch: bzr merge lp:~bregma/unity/lp-1077937
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2012-11-12
Marco Trevisan (Treviño) Approve on 2012-11-12
Łukasz Zemczak 2012-11-12 Approve on 2012-11-12
Review via email: mp+133959@code.launchpad.net

Commit Message

Fix FTBFS due to BAMF API change (lp: #1077937).

Description of the Change

= Problem description =

Unity FTBFS since bamf_view_user_visible was deprecated https://bugs.launchpad.net/unity/+bug/1077937

= The fix =

Renamed bamf_view_user_visible() to bamf_view_is_user_visible() to match BAMF API change.

= Test coverage =

Builds succeed instead of fail.

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

+1

review: Approve
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks for this.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Francis Ginther (fginther) wrote :

Investigating as a possible build infrastructure issue.

Francis Ginther (fginther) wrote :

Timestamps, logs and contents of libbamf3-dev_0.3.4bzr497pkg0quantal17_i386.deb (from private build archive) indicates that bamf rev 497 was built prior to the merge of rev 496. As a result the private build archive package for 497 did not contain the changes made by 496. This is a bug in the build infrastructure and will be fixed.

The bamf packages have been rebuilt from lp:bamf and now contain the correct contain. This is approved to retry the build.

Francis Ginther (fginther) wrote :

Second time passed, jenkins isn't posting the results for some reason (one more thing to investigate).

PASSED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/106/
Executed test runs:
    PASS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/106/console
    PASS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/106/console

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hud/HudController.cpp'
2--- hud/HudController.cpp 2012-11-08 09:12:24 +0000
3+++ hud/HudController.cpp 2012-11-12 17:25:24 +0000
4@@ -339,7 +339,7 @@
5 auto view = static_cast<BamfView*>(l->data);
6 Window xid = bamf_window_get_xid(win);
7
8- if (bamf_view_user_visible(view) && bamf_window_get_window_type(win) != BAMF_WINDOW_DOCK &&
9+ if (bamf_view_is_user_visible(view) && bamf_window_get_window_type(win) != BAMF_WINDOW_DOCK &&
10 wm.IsWindowOnCurrentDesktop(xid) &&
11 wm.IsWindowVisible(xid) &&
12 std::find(unity_xids.begin(), unity_xids.end(), xid) == unity_xids.end())
13
14=== modified file 'launcher/ApplicationLauncherIcon.cpp'
15--- launcher/ApplicationLauncherIcon.cpp 2012-11-06 18:19:09 +0000
16+++ launcher/ApplicationLauncherIcon.cpp 2012-11-12 17:25:24 +0000
17@@ -70,7 +70,7 @@
18 tooltip_text = BamfName();
19 icon_name = (icon ? icon.Str() : DEFAULT_ICON);
20
21- SetQuirk(Quirk::VISIBLE, bamf_view_user_visible(bamf_view));
22+ SetQuirk(Quirk::VISIBLE, bamf_view_is_user_visible(bamf_view));
23 SetQuirk(Quirk::ACTIVE, bamf_view_is_active(bamf_view));
24 SetQuirk(Quirk::RUNNING, bamf_view_is_running(bamf_view));
25
26@@ -245,7 +245,7 @@
27 if (arg.source != ActionArg::SWITCHER)
28 {
29 auto bamf_view = glib::object_cast<BamfView>(_bamf_app);
30- user_visible = bamf_view_user_visible(bamf_view);
31+ user_visible = bamf_view_is_user_visible(bamf_view);
32
33 if (active)
34 {
35@@ -392,7 +392,7 @@
36
37 if ((monitor >= 0 && bamf_window_get_monitor(window) == monitor) || monitor < 0)
38 {
39- if ((user_visible && bamf_view_user_visible(view)) || !user_visible)
40+ if ((user_visible && bamf_view_is_user_visible(view)) || !user_visible)
41 {
42 guint32 xid = bamf_window_get_xid(window);
43
44@@ -683,7 +683,7 @@
45
46 Window xid = bamf_window_get_xid(static_cast<BamfWindow*>(l->data));
47 bool urgent = bamf_view_is_urgent(view);
48- bool user_visible = bamf_view_user_visible(view);
49+ bool user_visible = bamf_view_is_user_visible(view);
50
51 if (any_urgent)
52 {
53@@ -960,7 +960,7 @@
54 BamfView* view = BAMF_VIEW(_bamf_app.RawPtr());
55 bamf_view_set_sticky(view, false);
56
57- SetQuirk(Quirk::VISIBLE, bamf_view_user_visible(view));
58+ SetQuirk(Quirk::VISIBLE, bamf_view_is_user_visible(view));
59
60 if (bamf_view_is_closed(view))
61 Remove();
62
63=== modified file 'panel/PanelMenuView.cpp'
64--- panel/PanelMenuView.cpp 2012-11-08 09:12:24 +0000
65+++ panel/PanelMenuView.cpp 2012-11-12 17:25:24 +0000
66@@ -1322,7 +1322,7 @@
67 continue;
68
69 Window xid = bamf_window_get_xid(static_cast<BamfWindow*>(l->data));
70- bool visible = bamf_view_user_visible(static_cast<BamfView*>(l->data));
71+ bool visible = bamf_view_is_user_visible(static_cast<BamfView*>(l->data));
72
73 if (visible && IsValidWindow(xid))
74 {