Merge lp:~3v1n0/bamf/desktop-class-matching-improved into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfLegacyWindow and BamfMatcher changes needed to get the proper WM_CLASS / desktop-class matching in BAMF.

BamfLegacyWindow and BamfMatcher changes needed to get the proper WM_CLASS matching in BAMF.

This mostly allow to get the wanted experience with the Chrome/Chromium web applications
so now:
 - When a Web application is launched and has a matching .desktop file (this means that
   the file should include the StartupWMClass parameter that matches the window's class
   instance name) then it's matched as a new application using that file.
 - When a Web application is launched and has not a matching .desktop file (no file
   matches its class), then we fallback to the know .desktop files (so very likely to the
   parent application desktop).

Changes include:
 - BamfLegacyWindow is now able to fetch both the window class name and instance name also
   for non-gtk3 builds (instead of using libwnck, we fallback to Xlib)
 - BamfXutils now avoid to open a display connection per request.
 - BamfMatcher includes now the utility function
   bamf_matcher_get_application_by_desktop_file that allows to remove a lot of code
   duplication. It correctly matches the chromium web applications and avoids the re-usage
   of non-optimum running .desktop files.

[lp:~3v1n0/bamf/desktop-class-matching-improved]

467. By Marco Trevisan (Treviño) on 2012-04-19

BamfMatcher: free the temporary list we use to order the windows by stack

468. By Marco Trevisan (Treviño) on 2012-04-19

BamfMatcher: be more explicit about the desktop file to use for a new application.

469. By Marco Trevisan (Treviño) on 2012-04-20

BamfMatcher: oops... Forgot an else when checking the type of new application we should create

[Jason Smith (jassmith)]

+1 looks okay

review: Approve

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2012-02-10 20:05:54 +0000
+++ src/bamf-legacy-window.c	2012-04-20 17:39:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  *
  */
 
@@ -47,6 +48,10 @@
 {
   WnckWindow * legacy_window;
   char       * mini_icon_path;
+#ifndef USE_GTK3
+  char       * group_name;
+  char       * instance_name;
+#endif
   gulong       closed_id;
   gulong       name_changed_id;
   gulong       state_changed_id;
@@ -105,7 +110,6 @@
   return wnck_window_is_skip_tasklist (self->priv->legacy_window);
 }
 
-#ifdef USE_GTK3
 const char *
 bamf_legacy_window_get_class_instance_name (BamfLegacyWindow *self)
 {
@@ -115,17 +119,29 @@
 
   window = self->priv->legacy_window;
 
+  if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_class_instance_name)
+    return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_class_instance_name (self);
+
   if (!window)
     return NULL;
 
+#ifdef USE_GTK3
   return wnck_window_get_class_instance_name (window);
+
+#else
+  if (!self->priv->instance_name)
+    {
+      Window xid = wnck_window_get_xid (window);
+      bamf_xutils_get_window_class_hints (xid, &self->priv->instance_name, NULL);
+    }
+
+  return self->priv->instance_name;
+#endif
 }
-#endif
 
 const char *
 bamf_legacy_window_get_class_name (BamfLegacyWindow *self)
 {
-  WnckClassGroup *group;
   WnckWindow *window;
 
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
@@ -138,12 +154,18 @@
   if (!window)
     return NULL;
 
-  group = wnck_window_get_class_group (window);
-
-  if (!group)
-    return NULL;
-
-  return wnck_class_group_get_res_class (group);
+#ifdef USE_GTK3
+  return wnck_window_get_class_group_name (window);
+
+#else
+  if (!self->priv->group_name)
+    {
+      Window xid = wnck_window_get_xid (window);
+      bamf_xutils_get_window_class_hints (xid, NULL, &self->priv->group_name);
+    }
+
+  return self->priv->group_name;
+#endif
 }
 
 const char *
@@ -186,7 +208,7 @@
     {
       g_string_append (exec, argv[i]);
       if (argv[i + 1] != NULL)
-	g_string_append (exec, " ");
+        g_string_append (exec, " ");
       g_free (argv[i]);
       i++;
     }
@@ -253,7 +275,6 @@
 {
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), 0);
 
-
   if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_xid)
     return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_xid (self);
 
@@ -347,10 +368,10 @@
 bamf_legacy_window_get_geometry (BamfLegacyWindow *self, gint *x, gint *y,
                                  gint *width, gint *height)
 {
-  *x = 0;
-  *y = 0;
-  *width = 0;
-  *height = 0;
+  if (x) *x = 0;
+  if (y) *y = 0;
+  if (width) *width = 0;
+  if (height) *height = 0;
 
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (self));
 
@@ -478,6 +499,20 @@
       self->priv->mini_icon_path = NULL;
     }
 
+#ifndef USE_GTK3
+  if (self->priv->group_name)
+    {
+      g_free (self->priv->group_name);
+      self->priv->group_name = NULL;
+    }
+
+  if (self->priv->instance_name)
+    {
+      g_free (self->priv->instance_name);
+      self->priv->instance_name = NULL;
+    }
+#endif
+
   if (self->priv->legacy_window)
     {
       g_signal_handler_disconnect (self->priv->legacy_window,

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2012-02-10 17:33:51 +0000
+++ src/bamf-legacy-window.h	2012-04-20 17:39:18 +0000
@@ -70,19 +70,20 @@
 {
   GObjectClass parent;
 
-  const char * (*get_name)             (BamfLegacyWindow *legacy_window);
-  const char * (*get_class_name)       (BamfLegacyWindow *legacy_window);
-  char       * (*get_exec_string)      (BamfLegacyWindow *legacy_window);
-  char       * (*get_app_id)           (BamfLegacyWindow *legacy_window);
-  char       * (*get_unique_bus_name)  (BamfLegacyWindow *legacy_window);
-  char       * (*get_menu_object_path) (BamfLegacyWindow *legacy_window);
-  gint         (*get_pid)              (BamfLegacyWindow *legacy_window);
-  guint32      (*get_xid)              (BamfLegacyWindow *legacy_window);
-  gboolean     (*needs_attention)      (BamfLegacyWindow *legacy_window);
-  gboolean     (*is_active)            (BamfLegacyWindow *legacy_window);
-  gboolean     (*is_skip_tasklist)     (BamfLegacyWindow *legacy_window);
-  gboolean     (*is_desktop)           (BamfLegacyWindow *legacy_window);
-  gboolean     (*is_dialog)            (BamfLegacyWindow *legacy_window);
+  const char * (*get_name)                (BamfLegacyWindow *legacy_window);
+  const char * (*get_class_name)          (BamfLegacyWindow *legacy_window);
+  const char * (*get_class_instance_name) (BamfLegacyWindow *legacy_window);
+  char       * (*get_exec_string)         (BamfLegacyWindow *legacy_window);
+  char       * (*get_app_id)              (BamfLegacyWindow *legacy_window);
+  char       * (*get_unique_bus_name)     (BamfLegacyWindow *legacy_window);
+  char       * (*get_menu_object_path)    (BamfLegacyWindow *legacy_window);
+  gint         (*get_pid)                 (BamfLegacyWindow *legacy_window);
+  guint32      (*get_xid)                 (BamfLegacyWindow *legacy_window);
+  gboolean     (*needs_attention)         (BamfLegacyWindow *legacy_window);
+  gboolean     (*is_active)               (BamfLegacyWindow *legacy_window);
+  gboolean     (*is_skip_tasklist)        (BamfLegacyWindow *legacy_window);
+  gboolean     (*is_desktop)              (BamfLegacyWindow *legacy_window);
+  gboolean     (*is_dialog)               (BamfLegacyWindow *legacy_window);
   BamfWindowMaximizationType (*maximized) (BamfLegacyWindow *legacy_window);
 
   void         (*get_geometry)         (BamfLegacyWindow *self,
@@ -126,9 +127,7 @@
 
 BamfWindowMaximizationType bamf_legacy_window_maximized    (BamfLegacyWindow *self);
 
-#ifdef USE_GTK3
 const char       * bamf_legacy_window_get_class_instance_name (BamfLegacyWindow *self);
-#endif
 
 const char       * bamf_legacy_window_get_class_name       (BamfLegacyWindow *self);
 

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-03-19 17:11:35 +0000
+++ src/bamf-matcher.c	2012-04-20 17:39:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -28,6 +28,7 @@
 #include "bamf-legacy-screen.h"
 #include "bamf-indicator-source.h"
 #include "bamf-xutils.h"
+#include <strings.h>
 
 G_DEFINE_TYPE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
 #define BAMF_MATCHER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
@@ -126,6 +127,37 @@
 
 static void bamf_matcher_unregister_view (BamfMatcher *self, BamfView *view);
 
+static BamfApplication *
+bamf_matcher_get_application_by_desktop_file (BamfMatcher *self, const char *desktop_file)
+{
+  GList *l;
+  BamfView *view;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
+
+  if (!desktop_file)
+    return NULL;
+
+  for (l = self->priv->views; l; l = l->next)
+    {
+      view = l->data;
+
+      if (!BAMF_IS_APPLICATION (view))
+        continue;
+
+      BamfApplication *app = BAMF_APPLICATION (view);
+      const gchar *app_desktop;
+      app_desktop = bamf_application_get_desktop_file (app);
+
+      if (g_strcmp0 (desktop_file, app_desktop) == 0)
+        {
+          return app;
+        }
+    }
+
+  return NULL;
+}
+
 static gboolean
 emit_paths_changed (gpointer user_data)
 {
@@ -177,11 +209,7 @@
 
 static void bamf_matcher_prepare_path_change (BamfMatcher *self, const gchar *desktop_file, ViewChangeType change_type)
 {
-  GList *l;
-  BamfView *view;
   BamfMatcherPrivate *priv;
-  const char *app_desktop;
-  gboolean found = FALSE;
 
   if (desktop_file == NULL) return;
 
@@ -189,26 +217,12 @@
 
   priv = self->priv;
 
-  for (l = priv->views; l; l = l->next)
-    {
-      view = l->data;
-
-      if (!BAMF_IS_APPLICATION (view) || !bamf_view_is_running (view))
-        continue;
-
-      app_desktop = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
-      if (!app_desktop) continue;
-
-      if (g_strcmp0 (desktop_file, app_desktop) == 0)
-        {
-          found = TRUE;
-          break;
-        }
-    }
-
   /* the app was already running (ADDED) / had more instances which are still
    * there (REMOVED) */
-  if (found) return;
+  if (bamf_matcher_get_application_by_desktop_file (self, desktop_file))
+    {
+      return;
+    }
 
   if (!priv->opened_closed_paths_table)
     {
@@ -258,7 +272,7 @@
   self->priv->views = g_list_prepend (self->priv->views, view);
 
   g_signal_emit_by_name (self, "view-opened", path, type);
-  
+
   // trigger manually since this is already active
   if (bamf_view_is_active (view))
     on_view_active_changed (view, TRUE, self);
@@ -1514,59 +1528,134 @@
 is_web_app_window (BamfMatcher *self, BamfLegacyWindow *window)
 {
   const char *window_class = bamf_legacy_window_get_class_name (window);
-#ifdef USE_GTK3
   const char *instance_name = bamf_legacy_window_get_class_instance_name(window);
-  // 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 window, so we
-  // skip the hint check. We can tell a window is a chrome web app window if its instance
-  // name is google-chrome but its window class is not Google-chrome
-  return !g_strcmp0(instance_name, "google-chrome") && g_strcmp0(window_class, "Google-chrome");
-#else
-  return g_str_has_prefix(window_class, "crx_");
-#endif
+
+  // 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
+  // window, so we skip the hint check.
+  // We can tell a window is a chrome web app window if its instance name is
+  // not google-chrome but its window class is Google-chrome
+  // We can tell a window is chromium web app window if its instance name is
+  // not chromium-browser but its window class is Chromium Browser
+
+  gboolean valid_app = FALSE;
+
+  if (g_strcmp0 (window_class, "Google-chrome") == 0 &&
+      g_strcmp0 (instance_name, "google-chrome") != 0)
+    {
+      valid_app = TRUE;
+    }
+  else if (g_strcmp0 (window_class, "Chromium-browser") == 0 &&
+           g_strcmp0 (instance_name, "chromium-browser") != 0)
+    {
+      valid_app = TRUE;
+    }
+
+  return valid_app;
+}
+
+static gboolean
+bamf_matcher_window_skips_hint_set (BamfMatcher *self, BamfLegacyWindow *window)
+{
+  gboolean skip_hint_set = FALSE;
+  g_return_val_if_fail (BAMF_IS_MATCHER (self), TRUE);
+
+  skip_hint_set = is_web_app_window (self, window);
+
+  return skip_hint_set;
+}
+
+static GList *
+bamf_matcher_get_class_matching_desktop_files (BamfMatcher *self, const gchar *class_name)
+{
+  GList* desktop_files = NULL;
+  gpointer key;
+  gpointer value;
+  GHashTableIter iter;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
+  g_hash_table_iter_init (&iter, self->priv->desktop_class_table);
+
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      gchar* desktop_file = g_strdup (key);
+      gchar* desktop_class = value;
+
+      if (g_strcmp0 (desktop_class, class_name) == 0)
+        {
+          desktop_files = g_list_prepend (desktop_files, desktop_file);
+        }
+    }
+
+  return desktop_files;
+}
+
+static gboolean
+bamf_matcher_has_instance_class_desktop_file (BamfMatcher *self, const gchar *class_name)
+{
+  gpointer key;
+  gpointer value;
+  GHashTableIter iter;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (self), FALSE);
+  g_hash_table_iter_init (&iter, self->priv->desktop_class_table);
+
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      gchar* desktop_class = value;
+
+      if (g_strcmp0 (desktop_class, class_name) == 0)
+        {
+          return TRUE;
+        }
+    }
+
+  return FALSE;
 }
 
 static GList *
 bamf_matcher_possible_applications_for_window (BamfMatcher *self,
                                                BamfWindow *bamf_window)
 {
-  char *hint = NULL;
   BamfMatcherPrivate *priv;
-  gint pid;
   BamfLegacyWindow *window;
-  GList *desktop_files = NULL, *pid_list = NULL, *l;
+  GList *desktop_files = NULL, *l;
+  char *desktop_file = NULL;
+  char *desktop_class = NULL;
 
   g_return_val_if_fail (BAMF_IS_WINDOW (bamf_window), NULL);
   g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
 
   priv = self->priv;
-
   window = bamf_window_get_window (bamf_window);
 
-  hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
-  const char *window_class = bamf_legacy_window_get_class_name (window);
-
-  if (hint)
+  desktop_file = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+
+  const char *class_name = bamf_legacy_window_get_class_name (window);
+  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 (desktop_file)
     {
-      /* whew, hard work, didn't even have to make a copy! */
-      if (hint[0] != '\0' && !is_web_app_window(self, window))
+      desktop_class = g_hash_table_lookup (priv->desktop_class_table, desktop_file);
+
+      if (!known_desktop_class || g_strcmp0 (desktop_class, desktop_file) == 0)
         {
-          desktop_files = g_list_prepend (desktop_files, hint);
+          desktop_files = g_list_prepend (desktop_files, desktop_file);
         }
       else
         {
-          g_free (hint);
+          g_free (desktop_file);
         }
     }
-  else
+
+  desktop_file = NULL;
+
+  if (!desktop_files)
     {
-      
-      char *desktop_file;
-      char *desktop_class;
-      
-      if (window_class)
+      if (class_name)
         {
-          char *window_class_down = g_ascii_strdown (window_class, -1);
+          char *window_class_down = g_ascii_strdown (class_name, -1);
           l = g_hash_table_lookup (priv->desktop_id_table, window_class_down);
           g_free (window_class_down);
 
@@ -1577,11 +1666,14 @@
               if (desktop_file)
                 {
                   desktop_class = g_hash_table_lookup (priv->desktop_class_table, desktop_file);
-                  if ((desktop_class == NULL || g_strcmp0 (desktop_class, window_class) == 0) &&
-                      !g_list_find_custom (desktop_files, desktop_file,
-                                           (GCompareFunc) g_strcmp0))
+
+                  if (!known_desktop_class || g_strcmp0 (desktop_class, instance_name) == 0)
                     {
-                      desktop_files = g_list_prepend (desktop_files, g_strdup (desktop_file));
+                      if (!g_list_find_custom (desktop_files, desktop_file,
+                                               (GCompareFunc) g_strcmp0))
+                        {
+                          desktop_files = g_list_prepend (desktop_files, g_strdup (desktop_file));
+                        }
                     }
                 }
             }
@@ -1589,31 +1681,10 @@
           desktop_files = g_list_reverse (desktop_files);
         }
 
-      /* Iterate over the desktop class table, and add matching desktop files */
-      gpointer key;
-      gpointer value;
-      GHashTableIter iter;
-      g_hash_table_iter_init (&iter, priv->desktop_class_table);
-
-      while (g_hash_table_iter_next (&iter, &key, &value))
-        {
-          desktop_file = g_strdup (key);
-          desktop_class = value;
-          if (g_strcmp0 (desktop_class, window_class) == 0 &&
-              !g_list_find_custom (desktop_files, desktop_file, (GCompareFunc) g_strcmp0))
-            {
-              desktop_files = g_list_prepend (desktop_files, desktop_file);
-            }
-          else
-            {
-              g_free (desktop_file);
-            }
-        }
-
-      pid = bamf_legacy_window_get_pid (window);
-      pid_list = bamf_matcher_possible_applications_for_pid (self, pid);
+      gint pid = bamf_legacy_window_get_pid (window);
+      GList *pid_list = bamf_matcher_possible_applications_for_pid (self, pid);
       
-      /* Append these files to the end to give preference to window_class style picking.
+      /* Append these files to the end to give preference to class_name style picking.
          This style of matching is prefered and used by GNOME Shell however does not work
          very well in practice, thus requiring the fallback here */
       for (l = pid_list; l; l = l->next)
@@ -1627,10 +1698,10 @@
             {
               gboolean append = FALSE;
 
-              if (window_class)
+              if (instance_name)
                 {
                   desktop_class = g_hash_table_lookup (priv->desktop_class_table, desktop_file);
-                  if (desktop_class == NULL || g_strcmp0 (desktop_class, window_class) == 0)
+                  if (!known_desktop_class || g_strcmp0 (desktop_class, instance_name) == 0)
                     {
                       append = TRUE;
                     }
@@ -1671,7 +1742,12 @@
 
       g_list_free (pid_list);
     }
-  
+
+  if (!desktop_files && known_desktop_class)
+    {
+      desktop_files = bamf_matcher_get_class_matching_desktop_files (self, instance_name);
+    }
+
   return desktop_files;
 }
 
@@ -1681,75 +1757,141 @@
 {
   GList *possible_apps, *l;
   BamfLegacyWindow *window;
-  GList *views, *a;
-  const char *win_class;
-  const char *desktop_file;
-  const char *app_class;
+  const gchar *app_class;
+  const gchar *app_desktop = NULL;
   BamfApplication *app = NULL, *best = NULL;
-  BamfView *view;
 
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (BAMF_IS_WINDOW (bamf_window));
 
   window = bamf_window_get_window (bamf_window);
-  views = self->priv->views;
 
   possible_apps = bamf_matcher_possible_applications_for_window (self, bamf_window);
-  win_class = bamf_legacy_window_get_class_name (window);
-
-  /* Loop over every application, inside that application see if its .desktop file
-   * matches with any of our possible hits. If so we match it. If we have no possible hits
-   * fall back to secondary matching. 
-   */
-  for (a = views; a; a = a->next)
-    {
-      view = a->data;
-
-      if (!BAMF_IS_APPLICATION (view))
-        continue;
-
-      app = BAMF_APPLICATION (view);
-      app_class = bamf_application_get_wmclass (app);
-      desktop_file = bamf_application_get_desktop_file (app);
-
-      if (possible_apps)
-        {
-          /* primary matching */
-
-          for (l = possible_apps; l; l = l->next)
-            {
-              if (g_strcmp0 (desktop_file, l->data) == 0)
-                {
-                  if (!best || !g_strcmp0 (win_class, app_class))
-                    best = app;
-                  break;
-                }
-            }
-        }
-      else if (desktop_file == NULL) 
-        {
-          /* secondary matching */
-          
-          if (bamf_application_contains_similar_to_window (app, bamf_window) && (!best || !g_strcmp0 (win_class, app_class)))
-            best = app;
+  const char *win_instance = bamf_legacy_window_get_class_instance_name (window);
+  const char *win_class_name = bamf_legacy_window_get_class_name (window);
+
+  app_class = win_instance;
+
+  /* Loop over every possible desktop file that could match the window, and try
+   * to reuse an already-opened window that uses it.
+   * Desktop files are ordered by priority, so we try to use the first possible,
+   * wm_class matching applications have the priority, btw. */
+  if (possible_apps)
+    {
+      /* primary matching */
+      for (l = possible_apps; l; l = l->next)
+        {
+          const gchar *desktop_file = l->data;
+          app = bamf_matcher_get_application_by_desktop_file (self, desktop_file);
+
+          if (BAMF_IS_APPLICATION (app))
+            {
+              const gchar *app_desktop_class;
+              app_desktop_class = bamf_application_get_wmclass (app);
+
+              if (win_instance && app_desktop_class && strcasecmp (win_instance, app_desktop_class) == 0)
+                {
+                  best = app;
+                  break;
+                }
+              else if (!best)
+                {
+                  best = app;
+                }
+            }
+        }
+
+      /* If a "best" application has been found, we should check again if the
+       * desktop file that is going to be used is really the best one we have.
+       * To do this, we compare the window class name with the desktop class
+       * of both candidates to ensure that really is the best one.
+       * This is important to avoid that very-similar (which differ only by
+       * StartupWMClass) running desktop files, would be wrongly used to match
+       * an incompatible window. */
+      if (BAMF_IS_APPLICATION (best) && possible_apps)
+        {
+          const gchar *best_app_desktop = bamf_application_get_desktop_file (best);
+          const gchar *best_desktop = possible_apps->data;
+
+          if (win_class_name && g_strcmp0 (best_app_desktop, best_desktop) != 0)
+            {
+              const gchar *best_app_class;
+              const gchar *best_desktop_class;
+
+              best_app_class = bamf_application_get_wmclass (best);
+              best_desktop_class = g_hash_table_lookup (self->priv->desktop_class_table, best_desktop);
+
+              /* We compare the two classes using their "distance" from the
+               * desidered class value */
+              if (best_app_class && best_desktop_class)
+                {
+                  int max_chars = strlen (win_class_name);
+                  int app_diff = strncasecmp (win_class_name, best_app_class, max_chars);
+                  int desktop_diff = strncasecmp (win_class_name, best_desktop_class, max_chars);
+
+                  if (abs (desktop_diff) < abs (app_diff))
+                    {
+                      best = bamf_matcher_get_application_by_desktop_file (self, best_desktop);
+                      app_desktop = best_desktop;
+                    }
+                }
+            }
+        }
+    }
+  else
+    {
+      /* secondary matching */
+      GList *a;
+      BamfView *view;
+      const gchar *app_desktop_class;
+
+      for (a = self->priv->views; a; a = a->next)
+        {
+          view = a->data;
+
+          if (!BAMF_IS_APPLICATION (view))
+            continue;
+
+          app = BAMF_APPLICATION (view);
+          app_desktop_class = bamf_application_get_wmclass (app);
+
+          if (bamf_application_contains_similar_to_window (app, bamf_window))
+            {
+              if (win_instance && g_strcmp0 (win_instance, app_desktop_class) == 0)
+                {
+                  best = app;
+                  break;
+                }
+              else if (!best)
+                {
+                  best = app;
+                }
+            }
         }
     }
 
   if (!best)
     {
-      if (possible_apps)
-        best = bamf_application_new_from_desktop_files (possible_apps);
+      if (app_desktop)
+        {
+          best = bamf_application_new_from_desktop_file (app_desktop);
+        }
+      else if (possible_apps)
+        {
+          best = bamf_application_new_from_desktop_files (possible_apps);
+        }
       else
-        best = bamf_application_new ();
-
-      bamf_application_set_wmclass (best, win_class);
-
+        {
+          best = bamf_application_new ();
+        }
+
+      bamf_application_set_wmclass (best, app_class);
       bamf_matcher_register_view_stealing_ref (self, BAMF_VIEW (best));
     }
 
-  g_list_free_full (possible_apps, g_free);
-
   bamf_view_add_child (BAMF_VIEW (best), BAMF_VIEW (bamf_window));
+
+  g_list_free_full (possible_apps, g_free);
 }
 
 /* Ensures that the window hint is set if a registered pid matches, and that set window hints
@@ -1760,7 +1902,7 @@
 {
   GArray *pids;
   GHashTable *registered_pids;
-  char *window_hint = NULL;
+  char *desktop_file_hint = NULL;
   gint i, pid;
   gpointer key;
 
@@ -1769,51 +1911,35 @@
 
   registered_pids = self->priv->registered_pids;
 
-  // web apps can end up forcing their parent browsers to match on them, so remove from pid table if this is the case
-  if (is_web_app_window (self, window))
-    {
+  /* Some windows such as web applications shares the pid with their parent
+   * browser so, we have to ignore them */
+  if (bamf_matcher_window_skips_hint_set (self, window))
+    {
+      return;
+    }
+
+  desktop_file_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+
+  if (desktop_file_hint)
+    {
+      /* already set, make sure we know about this
+       * fact for future windows of this applications */
       pid = bamf_legacy_window_get_pid (window);
 
       if (pid > 0)
         {
-          gpointer key = GINT_TO_POINTER (pid);
-          const char* result = g_hash_table_lookup (registered_pids, key);
-          if (result && g_str_has_prefix (result, "/home/"))
+          key = GINT_TO_POINTER (pid);
+
+          if (!g_hash_table_lookup (registered_pids, key))
             {
-              g_hash_table_remove (registered_pids, key);
+              g_hash_table_insert (registered_pids, key, g_strdup (desktop_file_hint));
             }
         }
 
+      g_free (desktop_file_hint);
       return;
     }
 
-  window_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
-  if (window_hint)
-    {
-      if (window_hint[0] != '\0')
-        {
-          /* already set, make sure we know about this
-           * fact for future windows of this applications */
-          pid = bamf_legacy_window_get_pid (window);
-
-          if (pid > 0)
-            {
-              key = GINT_TO_POINTER (pid);
-
-              if (!g_hash_table_lookup (registered_pids, key))
-                {
-                  g_hash_table_insert (registered_pids, key, g_strdup (window_hint));
-                }
-            }
-
-          g_free (window_hint);
-          return;
-        }
-
-      g_free (window_hint);
-      window_hint = NULL;
-    }
-
   pids = pid_parent_tree (self, bamf_legacy_window_get_pid (window));
 
   for (i = 0; i < pids->len; i++)
@@ -1821,15 +1947,15 @@
       pid = g_array_index (pids, gint, i);
       key = GINT_TO_POINTER (pid);
 
-      window_hint = g_hash_table_lookup (registered_pids, key);
-      if (window_hint != NULL && window_hint[0] != '\0')
+      desktop_file_hint = g_hash_table_lookup (registered_pids, key);
+      if (desktop_file_hint != NULL && desktop_file_hint[0] != '\0')
         break;
     }
 
   g_array_free (pids, TRUE);
 
-  if (window_hint)
-    set_window_hint (window, _NET_WM_DESKTOP_FILE, window_hint);
+  if (desktop_file_hint)
+    set_window_hint (window, _NET_WM_DESKTOP_FILE, desktop_file_hint);
 }
 
 static void
@@ -1895,13 +2021,6 @@
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
 
   role = get_window_hint (window, WM_WINDOW_ROLE);
-
-  if (role && role[0] == '\0')
-    {
-      g_free (role);
-      role = NULL;
-    }
-
   exec = g_strconcat ("gnome-control-center", (role ? " " : NULL), role, NULL);
 
   desktopFileTable = self->priv->desktop_file_table;
@@ -2013,15 +2132,11 @@
 bamf_matcher_setup_indicator_state (BamfMatcher *self, BamfIndicator *indicator)
 {
   GList *possible_apps, *l;
-  GList *views, *a;
   const char *desktop_file;
   BamfApplication *app = NULL, *best = NULL;
-  BamfView *view;
 
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (BAMF_IS_INDICATOR (indicator));
-  
-  views = self->priv->views;
 
   possible_apps = bamf_matcher_possible_applications_for_pid (self, bamf_indicator_get_pid (indicator));
 
@@ -2029,27 +2144,17 @@
    * matches with any of our possible hits. If so we match it. If we have no possible hits
    * fall back to secondary matching. 
    */
-  for (a = views; a && !best; a = a->next)
+  if (possible_apps)
     {
-      view = a->data;
-
-      if (!BAMF_IS_APPLICATION (view))
-        continue;
-
-      app = BAMF_APPLICATION (view);
-      desktop_file = bamf_application_get_desktop_file (app);
-      
-      if (possible_apps)
+      for (l = possible_apps; l; l = l->next)
         {
-          /* primary matching */
+          desktop_file = l->data;
+          app = bamf_matcher_get_application_by_desktop_file (self, desktop_file);
 
-          for (l = possible_apps; l; l = l->next)
+          if (BAMF_IS_APPLICATION (app))
             {
-              if (g_strcmp0 (desktop_file, l->data) == 0)
-                {
-                  best = app;
-                  break;
-                }
+              best = app;
+              break;
             }
         }
     }
@@ -2270,6 +2375,7 @@
       }
     }
 
+  g_list_free (windows);
   g_variant_builder_close (&b);
 
   return g_variant_builder_end (&b);
@@ -2279,27 +2385,15 @@
 bamf_matcher_application_is_running (BamfMatcher *matcher,
                                      const char *application)
 {
-  const char * desktop_file;
-  GList *l;
-  BamfView *view;
-  BamfMatcherPrivate *priv;
+  BamfApplication *app;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), FALSE);
 
-  priv = matcher->priv;
+  app = bamf_matcher_get_application_by_desktop_file (matcher, application);
 
-  for (l = priv->views; l; l = l->next)
+  if (BAMF_IS_APPLICATION (app))
     {
-      view = l->data;
-
-      if (!BAMF_IS_APPLICATION (view))
-        continue;
-
-      desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
-      if (g_strcmp0 (desktop_file, application) == 0)
-        {
-          return bamf_view_is_running (view);
-        }
+      return bamf_view_is_running (BAMF_VIEW (app));
     }
 
   return FALSE;
@@ -2370,27 +2464,15 @@
                                         const char *application)
 {
   const char * path = "";
-  const char * desktop_file;
-  GList *l;
-  BamfView *view;
-  BamfMatcherPrivate *priv;
+  BamfApplication *app;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
 
-  priv = matcher->priv;
+  app = bamf_matcher_get_application_by_desktop_file (matcher, application);
 
-  for (l = priv->views; l; l = l->next)
+  if (BAMF_IS_APPLICATION (app))
     {
-      view = l->data;
-
-      if (!BAMF_IS_APPLICATION (view))
-        continue;
-
-      desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
-      if (g_strcmp0 (desktop_file, application) == 0)
-        {
-          path = bamf_view_get_path (view);
-        }
+      return bamf_view_get_path (BAMF_VIEW (app));
     }
 
   return path;
@@ -2530,29 +2612,16 @@
 {
   GVariantBuilder b;
   GVariant *xids;
-  const char * desktop_file;
-  GList *l;
-  BamfView *view;
-  BamfMatcherPrivate *priv;
+  BamfApplication *app;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (matcher), NULL);
 
-  priv = matcher->priv;
   xids = NULL;
+  app = bamf_matcher_get_application_by_desktop_file (matcher, application);
 
-  for (l = priv->views; l; l = l->next)
+  if (BAMF_IS_APPLICATION (app))
     {
-      view = l->data;
-
-      if (!BAMF_IS_APPLICATION (view))
-        continue;
-
-      desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
-      if (g_strcmp0 (desktop_file, application) == 0)
-        {
-          xids = bamf_application_get_xids (BAMF_APPLICATION (view));
-          break;
-        }
+      xids = bamf_application_get_xids (app);
     }
 
   if (!xids)

=== modified file 'src/bamf-view.c'
--- src/bamf-view.c	2012-03-16 19:39:34 +0000
+++ src/bamf-view.c	2012-04-20 17:39:18 +0000
@@ -465,7 +465,9 @@
 
       ifaces = g_dbus_object_get_interfaces (G_DBUS_OBJECT (view));
 
-      for (l = ifaces; l; l = l->next)
+      /* The dbus object interface list is in reversed order, we try to export
+       * the interfaces in bottom to top order (BamfView should be the first) */
+      for (l = g_list_last(ifaces); l; l = l->prev)
         {
           g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (l->data),
                                             connection, path, &error);

=== modified file 'src/bamf-xutils.c'
--- src/bamf-xutils.c	2012-02-10 20:05:54 +0000
+++ src/bamf-xutils.c	2012-04-20 17:39:18 +0000
@@ -21,6 +21,29 @@
 #include "bamf-xutils.h"
 #include <string.h>
 
+static Display *
+get_xdisplay (gboolean *opened)
+{
+  Display *xdisplay;
+  xdisplay = gdk_x11_get_default_xdisplay ();
+
+  if (opened)
+    *opened = FALSE;
+
+  if (!xdisplay)
+    {
+      xdisplay = XOpenDisplay (NULL);
+
+      if (xdisplay)
+        {
+          if (opened)
+            *opened = TRUE;
+        }
+    }
+
+  return xdisplay;
+}
+
 char *
 bamf_xutils_get_window_hint (Window xid, const char *atom_name, Atom type)
 {
@@ -32,22 +55,17 @@
   gulong numItems;
   gulong bytesAfter;
   unsigned char *buffer;
-  gboolean close_display = TRUE;
+  gboolean close_display = FALSE;
 
   g_return_val_if_fail ((xid != 0), NULL);
   g_return_val_if_fail (atom_name, NULL);
 
-  XDisplay = XOpenDisplay (NULL);
+  XDisplay = get_xdisplay (&close_display);
+
   if (!XDisplay)
   {
-    XDisplay = gdk_x11_get_default_xdisplay ();
-    if (!XDisplay)
-    {
-      g_warning ("%s: Unable to get a valid XDisplay", G_STRFUNC);
-      return hint;
-    }
-    
-    close_display = FALSE;
+    g_warning ("%s: Unable to get a valid XDisplay", G_STRFUNC);
+    return NULL;
   }
 
   atom = XInternAtom (XDisplay, atom_name, FALSE);
@@ -70,7 +88,9 @@
 
   if (result == Success && numItems > 0)
     {
-      hint = g_strdup ((char*) buffer);
+      if (buffer && buffer[0] != '\0')
+        hint = g_strdup ((char*) buffer);
+
       XFree (buffer);
     }
 
@@ -81,22 +101,18 @@
 bamf_xutils_set_window_hint (Window xid, const char *atom_name, Atom type, const char *data)
 {
   Display *XDisplay;
-  gboolean close_display = TRUE;
+  gboolean close_display = FALSE;
 
   g_return_if_fail (xid != 0);
   g_return_if_fail (atom_name);
   g_return_if_fail (data);
   
-  XDisplay = XOpenDisplay (NULL);
+  XDisplay = get_xdisplay (&close_display);
+
   if (!XDisplay)
   {
-    XDisplay = gdk_x11_get_default_xdisplay ();
-    if (!XDisplay)
-    {
-      g_warning ("%s: Unable to get a valid XDisplay", G_STRFUNC);
-      return;
-    }
-    close_display = FALSE;
+    g_warning ("%s: Unable to get a valid XDisplay", G_STRFUNC);
+    return;
   }
 
   XChangeProperty (XDisplay,
@@ -113,3 +129,35 @@
   if (close_display)
     XCloseDisplay (XDisplay);
 }
+
+void
+bamf_xutils_get_window_class_hints (Window xid, char **class_instance_name, char **class_name)
+{
+  Display *xdisplay;
+  gboolean close_display = FALSE;
+
+  xdisplay = get_xdisplay (&close_display);
+
+  if (!xdisplay)
+  {
+    g_warning ("%s: Unable to get a valid XDisplay", G_STRFUNC);
+    return;
+  }
+
+  XClassHint class_hint;
+  class_hint.res_name = NULL;
+  class_hint.res_class = NULL;
+
+  XGetClassHint(xdisplay, xid, &class_hint);
+
+  if (class_name && class_hint.res_class && class_hint.res_class[0] != 0)
+    *class_name = g_convert (class_hint.res_class, -1, "utf-8", "iso-8859-1",
+                             NULL, NULL, NULL);
+
+  if (class_instance_name && class_hint.res_name && class_hint.res_name[0] != 0)
+    *class_instance_name = g_convert (class_hint.res_name, -1, "utf-8", "iso-8859-1",
+                                      NULL, NULL, NULL);
+
+  XFree (class_hint.res_class);
+  XFree (class_hint.res_name);
+}

=== modified file 'src/bamf-xutils.h'
--- src/bamf-xutils.h	2012-02-10 20:05:54 +0000
+++ src/bamf-xutils.h	2012-04-20 17:39:18 +0000
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef __BAMFXUTILS_H__
-#define __BAMFXUTILS_H__
+#ifndef __BAMF_XUTILS_H__
+#define __BAMF_XUTILS_H__
 
 #include <glib.h>
 #include <X11/Xatom.h>
@@ -29,4 +29,6 @@
 void  bamf_xutils_set_window_hint (Window xid, const char *atom_name, Atom type, const char *data);
 char* bamf_xutils_get_window_hint (Window xid, const char *atom_name, Atom type);
 
+void  bamf_xutils_get_window_class_hints (Window xid, char **class_instance_name, char **class_name);
+
 #endif