Merge lp:~abreu-alexandre/bamf/fix-chromeless-matching-for-webapps into lp:bamf/0.4

[Alexandre Abreu]

Fix chromeless launch for webapps: avoid double matching (browser + individual webapp)

Fix chromeless launch for webapps: avoid double matching (browser + individual webapp)

Fixes https://bugs.launchpad.net/libunity-webapps/+bug/1059475

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:523
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~abreu-alexandre/bamf/fix-chromeless-matching-for-webapps/+merge/149860/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/42/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/42/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/42//rebuild/?

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Needs Resubmitting

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

So, sorry for the big delay.

I've finally reviewed this bug, this fix breaks the fix for lp:692462, and we really don't want it.

Basically running "chromium-browser --app=http://google.com" with this causes to get a floating window with no related application icon at all.

review: Needs Fixing

Unmerged revisions

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-01-29 19:06:11 +0000
+++ src/bamf-matcher.c	2013-02-21 15:32:27 +0000
@@ -28,6 +28,7 @@
 
 #ifdef HAVE_WEBAPPS
 #include "bamf-unity-webapps-application.h"
+#include "bamf-unity-webapps-tab.h"
 #endif
 #include <strings.h>
 
@@ -1601,16 +1602,8 @@
 
   if (!filter_by_wmclass)
   {
-    if (is_web_app_window (window))
-      {
-        // This ensures that a new application is created even for unknown webapps
-        filter_by_wmclass = TRUE;
-      }
-    else
-      {
-        target_class = class_name;
-        filter_by_wmclass = bamf_matcher_has_instance_class_desktop_file (self, target_class);
-      }
+    target_class = class_name;
+    filter_by_wmclass = bamf_matcher_has_instance_class_desktop_file (self, target_class);
   }
 
   if (desktop_file)
@@ -1998,6 +1991,7 @@
   if (pid > 1 && !g_list_find (self->priv->known_pids, GUINT_TO_POINTER (pid)))
     self->priv->known_pids = g_list_prepend (self->priv->known_pids, GUINT_TO_POINTER (pid));
 
+  
   ensure_window_hint_set (self, window);
 
   /* We need to make our objects for bus export, the quickest way to do this, though not
@@ -2113,6 +2107,13 @@
       return;
     }
 
+  // A new chromeless webapp window will be "matched" later
+  // when the context daemon pick up the new "interest" in
+  // on_webapp_child_added to avoid duplicates (matching on the
+  // browser AND the webapp itself)
+  if (is_web_app_window(window))
+    return;
+
   if (is_open_office_window (self, window))
     {
       win_type = bamf_legacy_window_get_window_type (window);
@@ -2809,14 +2810,71 @@
 }
 
 #ifdef HAVE_WEBAPPS
+static gboolean
+does_webapp_tab_with_xid_exists(BamfMatcher *matcher, guint64 xid)
+{
+  GList *l;
+  BamfView *view;
+
+  g_return_val_if_fail(matcher != NULL, FALSE);
+  g_return_val_if_fail(matcher->priv != NULL, FALSE);
+
+  for (l = matcher->priv->views; l; l = l->next)
+    {
+      view = l->data;
+      if (!BAMF_IS_UNITY_WEBAPPS_TAB (view))
+        continue;
+
+      if (xid == bamf_tab_get_xid(BAMF_TAB(view)))
+        break;
+    }
+  return l != NULL;
+}
+
 static void
 on_webapp_child_added (BamfView *application,
                        BamfView *child,
                        gpointer user_data)
 {
   BamfMatcher *self;
+  BamfLegacyWindow * legacy_window;
 
   self = (BamfMatcher *)user_data;
+
+  if (!BAMF_IS_UNITY_WEBAPPS_TAB(child))
+    return;
+
+  legacy_window =
+    bamf_unity_webapps_tab_get_legacy_window_for(BAMF_UNITY_WEBAPPS_TAB(child));
+
+  if (is_web_app_window(legacy_window))
+    {
+      // Quickly check if we need to create an main window for
+      // this chromeless webapp (so that unity can pick it up as an
+      // independant window: see
+      // BamfApplicationManager::create_window & friends)
+      g_debug("Chromeless webapp launch detected: '%s'",
+              bamf_legacy_window_get_name (legacy_window));
+
+      gboolean do_register_bamf_window = TRUE;
+      if (self->priv->views
+          && does_webapp_tab_with_xid_exists(self, bamf_tab_get_xid(BAMF_TAB(child))))
+        do_register_bamf_window = FALSE;
+
+      if (do_register_bamf_window)
+        {
+          bamf_matcher_register_view_stealing_ref (self,
+              BAMF_VIEW (bamf_window_new (legacy_window)));
+        }
+      else
+        {
+          g_debug("Found at least another window/tab for chromeless"
+                  " webapp '%s' and same window id",
+                    bamf_legacy_window_get_name (legacy_window));
+        }
+    }
+
+  // In all cases register the new tab with the "Launcher" & bamf views
   bamf_matcher_register_view_stealing_ref (self, child);
 }
 

=== modified file 'src/bamf-unity-webapps-tab.c'
--- src/bamf-unity-webapps-tab.c	2013-02-04 19:19:57 +0000
+++ src/bamf-unity-webapps-tab.c	2013-02-21 15:32:27 +0000
@@ -402,11 +402,23 @@
 gint 
 bamf_unity_webapps_tab_get_interest_id (BamfUnityWebappsTab *tab)
 {
+  g_return_val_if_fail(tab != NULL, -1);
+  g_return_val_if_fail(BAMF_IS_UNITY_WEBAPPS_TAB(tab), -1);
   return tab->priv->interest_id;
 }
 
+BamfLegacyWindow*
+bamf_unity_webapps_tab_get_legacy_window_for (BamfUnityWebappsTab *tab)
+{
+  g_return_val_if_fail(tab != NULL, NULL);
+  g_return_val_if_fail(BAMF_IS_UNITY_WEBAPPS_TAB(tab), NULL);
+  return tab->priv->legacy_window;
+}
+
 BamfUnityWebappsTab *
 bamf_unity_webapps_tab_new (UnityWebappsContext *context, gint interest_id)
 {
   return (BamfUnityWebappsTab *)g_object_new (BAMF_TYPE_UNITY_WEBAPPS_TAB, "context", context, "interest-id", interest_id, NULL);
 }
+
+

=== modified file 'src/bamf-unity-webapps-tab.h'
--- src/bamf-unity-webapps-tab.h	2012-08-21 22:01:48 +0000
+++ src/bamf-unity-webapps-tab.h	2013-02-21 15:32:27 +0000
@@ -23,6 +23,7 @@
 
 #include <unity-webapps-context.h>
 
+#include "bamf-legacy-window.h"
 #include "bamf-tab.h"
 
 
@@ -55,7 +56,7 @@
 BamfUnityWebappsTab *bamf_unity_webapps_tab_new (UnityWebappsContext *context, gint interest_id);
 
 gint bamf_unity_webapps_tab_get_interest_id (BamfUnityWebappsTab *tab);
-
+BamfLegacyWindow* bamf_unity_webapps_tab_get_legacy_window_for(BamfUnityWebappsTab *tab);
 
 
 #endif