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

[Stephen M. Webb]

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

= 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.

[Łukasz Zemczak (sil2100)]

+1

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for this.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Investigating as a possible build infrastructure issue.

[Francis Ginther (fginther)]

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)]

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

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2012-11-08 09:12:24 +0000
+++ hud/HudController.cpp	2012-11-12 17:25:24 +0000
@@ -339,7 +339,7 @@
       auto view = static_cast<BamfView*>(l->data);
       Window xid = bamf_window_get_xid(win);
 
-      if (bamf_view_user_visible(view) && bamf_window_get_window_type(win) != BAMF_WINDOW_DOCK &&
+      if (bamf_view_is_user_visible(view) && bamf_window_get_window_type(win) != BAMF_WINDOW_DOCK &&
           wm.IsWindowOnCurrentDesktop(xid) &&
           wm.IsWindowVisible(xid) &&
           std::find(unity_xids.begin(), unity_xids.end(), xid) == unity_xids.end())

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2012-11-06 18:19:09 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2012-11-12 17:25:24 +0000
@@ -70,7 +70,7 @@
   tooltip_text = BamfName();
   icon_name = (icon ? icon.Str() : DEFAULT_ICON);
 
-  SetQuirk(Quirk::VISIBLE, bamf_view_user_visible(bamf_view));
+  SetQuirk(Quirk::VISIBLE, bamf_view_is_user_visible(bamf_view));
   SetQuirk(Quirk::ACTIVE, bamf_view_is_active(bamf_view));
   SetQuirk(Quirk::RUNNING, bamf_view_is_running(bamf_view));
 
@@ -245,7 +245,7 @@
   if (arg.source != ActionArg::SWITCHER)
   {
     auto bamf_view = glib::object_cast<BamfView>(_bamf_app);
-    user_visible = bamf_view_user_visible(bamf_view);
+    user_visible = bamf_view_is_user_visible(bamf_view);
 
     if (active)
     {
@@ -392,7 +392,7 @@
 
     if ((monitor >= 0 && bamf_window_get_monitor(window) == monitor) || monitor < 0)
     {
-      if ((user_visible && bamf_view_user_visible(view)) || !user_visible)
+      if ((user_visible && bamf_view_is_user_visible(view)) || !user_visible)
       {
         guint32 xid = bamf_window_get_xid(window);
 
@@ -683,7 +683,7 @@
 
     Window xid = bamf_window_get_xid(static_cast<BamfWindow*>(l->data));
     bool urgent = bamf_view_is_urgent(view);
-    bool user_visible = bamf_view_user_visible(view);
+    bool user_visible = bamf_view_is_user_visible(view);
 
     if (any_urgent)
     {
@@ -960,7 +960,7 @@
   BamfView* view = BAMF_VIEW(_bamf_app.RawPtr());
   bamf_view_set_sticky(view, false);
 
-  SetQuirk(Quirk::VISIBLE, bamf_view_user_visible(view));
+  SetQuirk(Quirk::VISIBLE, bamf_view_is_user_visible(view));
 
   if (bamf_view_is_closed(view))
     Remove();

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2012-11-08 09:12:24 +0000
+++ panel/PanelMenuView.cpp	2012-11-12 17:25:24 +0000
@@ -1322,7 +1322,7 @@
       continue;
 
     Window xid = bamf_window_get_xid(static_cast<BamfWindow*>(l->data));
-    bool visible = bamf_view_user_visible(static_cast<BamfView*>(l->data));
+    bool visible = bamf_view_is_user_visible(static_cast<BamfView*>(l->data));
 
     if (visible && IsValidWindow(xid))
     {