Merge lp:~3v1n0/bamf/desktopless-webapps-fix into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfMatcher: match chromium web applications with no .desktop file as new applications

Chromium applications with no desktop file are matched as new applications anyway...

[Jason Smith (jassmith)]

Line 22 of the diff could be after the short circuit to save some spare computations. Other than that, good.

review: Approve

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2012-03-16 19:39:34 +0000
+++ src/bamf-application.c	2012-04-26 06:28:24 +0000
@@ -300,17 +300,20 @@
 
 gboolean
 bamf_application_contains_similar_to_window (BamfApplication *self,
-                                             BamfWindow *window)
+                                             BamfWindow *bamf_window)
 {
-  gboolean result = FALSE;
-  const char *class, *owned_class;
   GList *children, *l;
   BamfView *child;
 
   g_return_val_if_fail (BAMF_IS_APPLICATION (self), FALSE);
-  g_return_val_if_fail (BAMF_IS_WINDOW (window), FALSE);
-
-  class = bamf_legacy_window_get_class_name (bamf_window_get_window (window));
+  g_return_val_if_fail (BAMF_IS_WINDOW (bamf_window), FALSE);
+
+  BamfLegacyWindow *window = bamf_window_get_window (bamf_window);
+  const char *window_class = bamf_legacy_window_get_class_name (window);
+  const char *instance_name = bamf_legacy_window_get_class_instance_name (window);
+
+  if (!window_class || !instance_name)
+    return FALSE;
 
   children = bamf_view_get_children (BAMF_VIEW (self));
   for (l = children; l; l = l->next)
@@ -320,16 +323,18 @@
       if (!BAMF_IS_WINDOW (child))
         continue;
 
-      owned_class = bamf_legacy_window_get_class_name (bamf_window_get_window (BAMF_WINDOW (child)));
+      window = bamf_window_get_window (BAMF_WINDOW (child));
+      const char *owned_win_class = bamf_legacy_window_get_class_name (window);
+      const char *owned_instance = bamf_legacy_window_get_class_instance_name (window);
 
-      if (g_strcmp0 (class, owned_class) == 0)
+      if (g_strcmp0 (window_class, owned_win_class) == 0 &&
+          g_strcmp0 (instance_name, owned_instance) == 0)
         {
-          result = TRUE;
-          break;
+          return TRUE;
         }
     }
 
-  return result;
+  return FALSE;
 }
 
 gboolean

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-04-20 17:36:00 +0000
+++ src/bamf-matcher.c	2012-04-26 06:28:24 +0000
@@ -1528,7 +1528,7 @@
 is_web_app_window (BamfMatcher *self, BamfLegacyWindow *window)
 {
   const char *window_class = bamf_legacy_window_get_class_name (window);
-  const char *instance_name = bamf_legacy_window_get_class_instance_name(window);
+  const char *instance_name = bamf_legacy_window_get_class_instance_name (window);
 
   // Chrome/Chromium uses url wm_class strings to represent its web apps.
   // These apps will still have the same parent pid and hints as the main chrome
@@ -1541,12 +1541,14 @@
   gboolean valid_app = FALSE;
 
   if (g_strcmp0 (window_class, "Google-chrome") == 0 &&
-      g_strcmp0 (instance_name, "google-chrome") != 0)
+      g_strcmp0 (instance_name, "google-chrome") != 0 &&
+      !g_str_has_prefix (instance_name, "Google-chrome"))
     {
       valid_app = TRUE;
     }
   else if (g_strcmp0 (window_class, "Chromium-browser") == 0 &&
-           g_strcmp0 (instance_name, "chromium-browser") != 0)
+           g_strcmp0 (instance_name, "chromium-browser") != 0 &&
+           !g_str_has_prefix (instance_name, "Chromium-browser"))
     {
       valid_app = TRUE;
     }
@@ -1635,11 +1637,16 @@
   const char *instance_name = bamf_legacy_window_get_class_instance_name (window);
   gboolean known_desktop_class = bamf_matcher_has_instance_class_desktop_file (self, instance_name);
 
+  if (!known_desktop_class)
+  {
+    known_desktop_class = is_web_app_window (self, window);
+  }
+
   if (desktop_file)
     {
       desktop_class = g_hash_table_lookup (priv->desktop_class_table, desktop_file);
 
-      if (!known_desktop_class || g_strcmp0 (desktop_class, desktop_file) == 0)
+      if (!known_desktop_class || g_strcmp0 (desktop_class, instance_name) == 0)
         {
           desktop_files = g_list_prepend (desktop_files, desktop_file);
         }
@@ -1730,7 +1737,7 @@
                             }
                         }
                     }
-                  
+
                   desktop_files = g_list_insert_before (desktop_files, last, desktop_file);
                 }
               else