Merge lp:~3v1n0/bamf/qmlapp-matching-0.4 into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfMatcher: correctly match QML applications launched with qmlscene or qmlviewer

This also includes adding support to the "--desktop_file_hint" exec parameter to override
matching and caching the window exec string in BamfLegacyWindow.

Backported branches lp:~3v1n0/bamf/qmlapp-matching, lp:~3v1n0/bamf/desktop_file_hint-exec-override and lp:~3v1n0/bamf/cache-exec-string to Bamf 0.4

[Christopher Townsend (townsend)]

Looks like a straight forward backport. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2013-05-24 17:00:19 +0000
+++ src/bamf-application.c	2013-07-25 12:39:27 +0000
@@ -300,7 +300,7 @@
                 break;
 
               g_free (icon);
-              icon = bamf_legacy_window_get_exec_string (bamf_window_get_window (window));
+              icon = g_strdup (bamf_legacy_window_get_exec_string (bamf_window_get_window (window)));
 
               if (icon_name_is_valid (icon))
                 break;
@@ -444,9 +444,6 @@
   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)
     {
 
=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2013-04-18 13:57:15 +0000
+++ src/bamf-legacy-window-test.c	2013-07-25 12:39:27 +0000
@@ -221,14 +221,14 @@
   return self->wm_class_instance;
 }
 
-char *
+const char *
 bamf_legacy_window_test_get_exec_string (BamfLegacyWindow *legacy_window)
 {
   BamfLegacyWindowTest *self;
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return g_strdup (self->exec);
+  return self->exec;
 }
 
 char *
 
=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2013-04-18 14:20:02 +0000
+++ src/bamf-legacy-window.c	2013-07-25 12:39:27 +0000
@@ -51,7 +51,8 @@
 struct _BamfLegacyWindowPrivate
 {
   WnckWindow * legacy_window;
-  char       * mini_icon_path;
+  gchar      * mini_icon_path;
+  gchar      * exec_string;
   gboolean     is_closed;
 };
 
@@ -218,10 +219,9 @@
   return result;
 }
 
-char *
+const char *
 bamf_legacy_window_get_exec_string (BamfLegacyWindow *self)
 {
-  gchar *result = NULL;
   gint pid = 0, i = 0;
   gchar **argv = NULL;
   GString *exec = NULL;
@@ -232,6 +232,9 @@
   if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_exec_string)
     return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_exec_string (self);
 
+  if (self->priv->exec_string)
+    return self->priv->exec_string;
+
   pid = bamf_legacy_window_get_pid (self);
 
   if (pid == 0)
@@ -251,9 +254,10 @@
 
   g_free (argv);
 
-  result = g_strdup (exec->str);
+  self->priv->exec_string = g_strdup (exec->str);
   g_string_free (exec, TRUE);
-  return result;
+
+  return self->priv->exec_string;
 }
 
 const char *
@@ -561,7 +565,6 @@
 
   self = BAMF_LEGACY_WINDOW (object);
 
-
   if (self->priv->mini_icon_path)
     {
       file = g_file_new_for_path (self->priv->mini_icon_path);
@@ -572,6 +575,12 @@
       self->priv->mini_icon_path = NULL;
     }
 
+  if (self->priv->exec_string)
+    {
+      g_free (self->priv->exec_string);
+      self->priv->exec_string = NULL;
+    }
+
   g_signal_handlers_disconnect_by_data (wnck_screen_get_default (), self);
 
   if (self->priv->legacy_window)
 
=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2013-04-17 00:48:32 +0000
+++ src/bamf-legacy-window.h	2013-07-25 12:39:27 +0000
@@ -77,7 +77,7 @@
   const char * (*get_role)                (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);
+  const char * (*get_exec_string)         (BamfLegacyWindow *legacy_window);
   char       * (*get_process_name)        (BamfLegacyWindow *legacy_window);
   char       * (*get_app_id)              (BamfLegacyWindow *legacy_window);
   char       * (*get_unique_bus_name)     (BamfLegacyWindow *legacy_window);
@@ -149,7 +149,7 @@
 
 const char       * bamf_legacy_window_save_mini_icon       (BamfLegacyWindow *self);
 
-char             * bamf_legacy_window_get_exec_string      (BamfLegacyWindow *self);
+const char       * bamf_legacy_window_get_exec_string      (BamfLegacyWindow *self);
 
 char             * bamf_legacy_window_get_process_name     (BamfLegacyWindow *self);
 
 
=== modified file 'src/bamf-matcher-private.h'
--- src/bamf-matcher-private.h	2013-03-28 17:22:08 +0000
+++ src/bamf-matcher-private.h	2013-07-25 12:39:27 +0000
@@ -51,7 +51,8 @@
 
 BamfApplication * bamf_matcher_get_application_by_desktop_file (BamfMatcher *self, const char *desktop_file);
 BamfApplication * bamf_matcher_get_application_by_xid (BamfMatcher *self, guint xid);
+gboolean bamf_matcher_is_valid_process_prefix (BamfMatcher *self, const char *exec);
 char * bamf_matcher_get_trimmed_exec (BamfMatcher *self, const char *exec);
-gboolean bamf_matcher_is_valid_process_prefix (BamfMatcher *self, const char *exec);
+char * get_exec_overridden_desktop_file (const char *exec);
 
 #endif
 
=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-04-18 14:20:02 +0000
+++ src/bamf-matcher.c	2013-07-25 12:39:27 +0000
@@ -57,13 +57,16 @@
 // Prefixes to be ignored in exec strings
 const gchar* EXEC_BAD_PREFIXES[] =
 {
-  "^gksu(do)?$", "^sudo$", "^su-to-root$", "^amdxdg-su$", "^java(ws)?$",
+  "^gksu(do)?$", "^sudo$", "^su-to-root$", "^amdxdg-su$", "^java(ws)?$", "^cli$",
   "^mono$", "^ruby$", "^padsp$", "^aoss$", "^python(\\d.\\d)?$", "^(ba)?sh$",
-  "^perl$", "^env$", "^xdg-open$",
+  "^perl$", "^env$", "^xdg-open$", "^qmlscene$", "^qmlviewer$",
   /* javaws strings: */ "^net\\.sourceforge\\.jnlp\\.runtime\\.Boot$", "^rt\\.jar$",
                         "^com\\.sun\\.javaws\\.Main$", "^deploy\\.jar$"
 };
 
+// Sufixes to be ignored in exec strings
+const gchar* EXEC_BAD_SUFIXES = "(\\.bin|\\.py|\\.pl|\\.qml)$";
+
 // Prefixes that must be considered starting point of exec strings
 const gchar* EXEC_GOOD_PREFIXES[] =
 {
@@ -71,6 +74,8 @@
   "^sol$"
 };
 
+const gchar * EXEC_DESKTOP_FILE_OVERRIDE = "--desktop_file_hint";
+
 static void
 on_view_active_changed (BamfView *view, gboolean active, BamfMatcher *matcher)
 {
@@ -441,9 +446,16 @@
   for (i = 0; i < parts_size; ++i)
     {
       part = parts[i];
-      if (*part == '%' || g_utf8_strrchr (part, -1, '='))
+      if (*part == '%' || *part == '$' || g_utf8_strrchr (part, -1, '='))
         continue;
 
+      if (i+1 < parts_size && g_strcmp0 (parts[i], EXEC_DESKTOP_FILE_OVERRIDE) == 0)
+        {
+          /* Skip if the .desktop file is overridden using the exec parameter */
+          ++i;
+          continue;
+        }
+
       if (*part != '-' || good_prefix)
         {
           if (!result)
@@ -519,7 +531,7 @@
     {
       tmp = result;
 
-      regex = g_regex_new ("(\\.bin|\\.py|\\.pl)$", 0, 0, NULL);
+      regex = g_regex_new (EXEC_BAD_SUFIXES, 0, 0, NULL);
       result = g_regex_replace_literal (regex, result, -1, 0, "", 0, NULL);
 
       g_free (tmp);
@@ -531,6 +543,37 @@
   return result;
 }
 
+char *
+get_exec_overridden_desktop_file (const char *exec_string)
+{
+  gchar *result = NULL;
+  gchar **parts;
+  gint i, parts_size;
+
+  if (!exec_string || exec_string[0] == '\0')
+    return result;
+
+  if (!g_shell_parse_argv (exec_string, &parts_size, &parts, NULL))
+    return result;
+
+  for (i = 0; i < parts_size; ++i)
+    {
+      if (i+1 < parts_size && g_strcmp0 (parts[i], EXEC_DESKTOP_FILE_OVERRIDE) == 0)
+        {
+          if (g_str_has_suffix (parts[i+1], ".desktop") &&
+              g_file_test (parts[i+1], G_FILE_TEST_EXISTS|G_FILE_TEST_IS_REGULAR))
+            {
+              result = g_strdup (parts[i+1]);
+              break;
+            }
+        }
+    }
+
+  g_strfreev (parts);
+
+  return result;
+}
+
 static GList *
 pid_parent_tree (BamfMatcher *self, guint pid)
 {
@@ -1408,7 +1451,7 @@
 {
   BamfMatcherPrivate *priv;
   GList *result = NULL, *table_list, *l;
-  char *exec_string;
+  const char *exec_string;
   char *trimmed;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
@@ -1434,7 +1477,6 @@
             }
           g_free (trimmed);
         }
-      g_free (exec_string);
     }
 
   if (result)
@@ -1596,18 +1638,18 @@
   filter_by_wmclass = bamf_matcher_has_instance_class_desktop_file (self, target_class);
 
   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);
-      }
-  }
+    {
+      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);
+        }
+    }
 
   if (desktop_file)
     {
@@ -1622,6 +1664,16 @@
           g_free (desktop_file);
         }
     }
+  else
+    {
+      const char *exec_string = bamf_legacy_window_get_exec_string (window);
+      desktop_file = get_exec_overridden_desktop_file (exec_string);
+
+      if (desktop_file)
+        {
+          desktop_files = g_list_prepend (desktop_files, desktop_file);
+        }
+    }
 
   desktop_file = NULL;
 
@@ -1839,60 +1891,62 @@
 
       const gchar *app_desktop_class;
 
-      for (a = self->priv->views; a; a = a->next)
+      const char *win_instance_name = bamf_legacy_window_get_class_instance_name (window);
+      const char *exec_string = bamf_legacy_window_get_exec_string (window);
+      char *trimmed_exec = bamf_matcher_get_trimmed_exec (self, exec_string);
+
+      if (trimmed_exec || win_class_name || win_instance_name)
         {
-          view = a->data;
-
-          if (!BAMF_IS_APPLICATION (view))
-            continue;
-
-          app = BAMF_APPLICATION (view);
-
-          if (bamf_application_contains_similar_to_window (app, bamf_window))
+          for (a = self->priv->views; a; a = a->next)
             {
-              char *exec_string = bamf_legacy_window_get_exec_string (window);
-              char *trimmed_exec = bamf_matcher_get_trimmed_exec (self, exec_string);
-              g_free (exec_string);
-
-              GList *ll;
-              gboolean found_exec = FALSE;
-              for (ll = bamf_view_get_children (BAMF_VIEW (app)); ll && !found_exec; ll = ll->next)
+              view = a->data;
+
+              if (!BAMF_IS_APPLICATION (view))
+                continue;
+
+              app = BAMF_APPLICATION (view);
+
+              if (bamf_application_contains_similar_to_window (app, bamf_window))
                 {
-                  if (!BAMF_IS_WINDOW (ll->data))
+                  GList *ll;
+                  gboolean found_exec = FALSE;
+                  for (ll = bamf_view_get_children (BAMF_VIEW (app)); ll && !found_exec; ll = ll->next)
+                    {
+                      if (!BAMF_IS_WINDOW (ll->data))
+                        continue;
+
+                      BamfLegacyWindow *w = bamf_window_get_window (BAMF_WINDOW (ll->data));
+                      const char *wexec = bamf_legacy_window_get_exec_string (w);
+                      char *wtrimmed = bamf_matcher_get_trimmed_exec (self, wexec);
+
+                      if (g_strcmp0 (trimmed_exec, wtrimmed) == 0)
+                        {
+                          best = BAMF_APPLICATION (view);
+                          found_exec = TRUE;
+                        }
+
+                      g_free (wtrimmed);
+                    }
+
+                  if (!found_exec)
                     continue;
 
-                  BamfLegacyWindow *w = bamf_window_get_window (BAMF_WINDOW (ll->data));
-                  char *wexec = bamf_legacy_window_get_exec_string (w);
-                  char *wtrimmed = bamf_matcher_get_trimmed_exec (self, wexec);
-                  g_free (wexec);
-
-                  if (g_strcmp0 (trimmed_exec, wtrimmed) == 0)
-                    {
-                      best = BAMF_APPLICATION (view);
-                      found_exec = TRUE;
-                    }
-
-                  g_free (wtrimmed);
-                }
-
-              g_free (trimmed_exec);
-
-              if (!found_exec)
-                continue;
-
-              app_desktop_class = bamf_application_get_wmclass (app);
-
-              if (target_class && g_strcmp0 (target_class, app_desktop_class) == 0)
-                {
-                  best = app;
-                  break;
-                }
-              else if (!best)
-                {
-                  best = app;
+                  app_desktop_class = bamf_application_get_wmclass (app);
+
+                  if (target_class && g_strcmp0 (target_class, app_desktop_class) == 0)
+                    {
+                      best = app;
+                      break;
+                    }
+                  else if (!best)
+                    {
+                      best = app;
+                    }
                 }
             }
         }
+
+      g_free (trimmed_exec);
     }
 
   if (!best)
 
=== modified file 'tests/bamfdaemon/test-application.c'
--- tests/bamfdaemon/test-application.c	2013-05-30 22:06:14 +0000
+++ tests/bamfdaemon/test-application.c	2013-07-25 12:39:27 +0000
@@ -28,46 +28,11 @@
 
 #define DESKTOP_FILE "/usr/share/applications/gnome-terminal.desktop"
 
-static void test_allocation          (void);
-static void test_desktop_file        (void);
-static void test_desktop_no_icon     (void);
-static void test_get_mime_types      (void);
-static void test_get_mime_types_none (void);
-static void test_urgent              (void);
-static void test_active              (void);
-static void test_get_xids            (void);
-static void test_manages_xid         (void);
-static void test_user_visible        (void);
-static void test_urgent              (void);
-static void test_window_added        (void);
-static void test_window_removed      (void);
-
 static gboolean          signal_seen   = FALSE;
 static gboolean          signal_result = FALSE;
 static char *            signal_window = NULL;
 static GDBusConnection * gdbus_connection = NULL;
 
-void
-test_application_create_suite (GDBusConnection *connection)
-{
-#define DOMAIN "/Application"
-
-  gdbus_connection = connection;
-
-  g_test_add_func (DOMAIN"/Allocation", test_allocation);
-  g_test_add_func (DOMAIN"/DesktopFile", test_desktop_file);
-  g_test_add_func (DOMAIN"/DesktopFile/NoIcon", test_desktop_no_icon);
-  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/Valid", test_get_mime_types);
-  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/None", test_get_mime_types_none);
-  g_test_add_func (DOMAIN"/ManagesXid", test_manages_xid);
-  g_test_add_func (DOMAIN"/Xids", test_get_xids);
-  g_test_add_func (DOMAIN"/Events/Active", test_active);
-  g_test_add_func (DOMAIN"/Events/Urgent", test_urgent);
-  g_test_add_func (DOMAIN"/Events/UserVisible", test_user_visible);
-  g_test_add_func (DOMAIN"/Events/WindowAdded", test_window_added);
-  g_test_add_func (DOMAIN"/Events/WindowRemoved", test_window_removed);
-}
-
 static void
 test_allocation (void)
 {
@@ -536,3 +501,104 @@
   g_object_unref (window);
   g_object_unref (test);
 }
+
+static void
+test_contain_similar_to_window (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win, *win1, *win2, *win3;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", NULL, "binary");
+  bamf_legacy_window_test_set_wmclass (lwin, "ClassName", "ClassInstance");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_object_unref (lwin);
+
+  lwin = bamf_legacy_window_test_new (30, "window1", NULL, "binary1");
+  bamf_legacy_window_test_set_wmclass (lwin, "ClassName", "ClassInstance");
+  win1 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+  g_assert (bamf_application_contains_similar_to_window (application, win1));
+
+  lwin = bamf_legacy_window_test_new (40, "window2", NULL, "binary2");
+  bamf_legacy_window_test_set_wmclass (lwin, "ClassName", "ClassInstance2");
+  win2 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+  g_assert (!bamf_application_contains_similar_to_window (application, win2));
+
+  lwin = bamf_legacy_window_test_new (50, "window3", NULL, "binary3");
+  bamf_legacy_window_test_set_wmclass (lwin, "ClassName3", "ClassInstance");
+  win3 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+  g_assert (!bamf_application_contains_similar_to_window (application, win3));
+
+  g_object_unref (win);
+  g_object_unref (win1);
+  g_object_unref (win2);
+  g_object_unref (win3);
+  g_object_unref (application);
+}
+
+static void
+test_contain_similar_to_window_null (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win, *win1, *win2, *win3;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", NULL, "binary");
+  bamf_legacy_window_test_set_wmclass (lwin, NULL, NULL);
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_object_unref (lwin);
+
+  lwin = bamf_legacy_window_test_new (30, "window1", NULL, "binary1");
+  bamf_legacy_window_test_set_wmclass (lwin, NULL, NULL);
+  win1 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+  g_assert (bamf_application_contains_similar_to_window (application, win1));
+
+  lwin = bamf_legacy_window_test_new (40, "window2", NULL, "binary2");
+  bamf_legacy_window_test_set_wmclass (lwin, "ClassName", NULL);
+  win2 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+  g_assert (!bamf_application_contains_similar_to_window (application, win2));
+
+  lwin = bamf_legacy_window_test_new (50, "window3", NULL, "binary3");
+  bamf_legacy_window_test_set_wmclass (lwin, NULL, "ClassInstance");
+  win3 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+  g_assert (!bamf_application_contains_similar_to_window (application, win3));
+
+  g_object_unref (win);
+  g_object_unref (win1);
+  g_object_unref (win2);
+  g_object_unref (win3);
+  g_object_unref (application);
+}
+
+void
+test_application_create_suite (GDBusConnection *connection)
+{
+#define DOMAIN "/Application"
+
+  gdbus_connection = connection;
+
+  g_test_add_func (DOMAIN"/Allocation", test_allocation);
+  g_test_add_func (DOMAIN"/ContainsSimilarToWindow", test_contain_similar_to_window);
+  g_test_add_func (DOMAIN"/ContainsSimilarToWindow/Null", test_contain_similar_to_window_null);
+  g_test_add_func (DOMAIN"/DesktopFile", test_desktop_file);
+  g_test_add_func (DOMAIN"/DesktopFile/NoIcon", test_desktop_no_icon);
+  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/Valid", test_get_mime_types);
+  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/None", test_get_mime_types_none);
+  g_test_add_func (DOMAIN"/ManagesXid", test_manages_xid);
+  g_test_add_func (DOMAIN"/Xids", test_get_xids);
+  g_test_add_func (DOMAIN"/Events/Active", test_active);
+  g_test_add_func (DOMAIN"/Events/Urgent", test_urgent);
+  g_test_add_func (DOMAIN"/Events/UserVisible", test_user_visible);
+  g_test_add_func (DOMAIN"/Events/WindowAdded", test_window_added);
+  g_test_add_func (DOMAIN"/Events/WindowRemoved", test_window_removed);
+}
 
=== modified file 'tests/bamfdaemon/test-matcher.c'
--- tests/bamfdaemon/test-matcher.c	2013-05-24 17:11:00 +0000
+++ tests/bamfdaemon/test-matcher.c	2013-07-25 12:39:27 +0000
@@ -26,50 +26,12 @@
 #include "bamf-legacy-window.h"
 #include "bamf-legacy-window-test.h"
 
-static void test_allocation (void);
-static void test_load_desktop_file (void);
-static void test_load_desktop_file_no_display_has_lower_prio_same_id (void);
-static void test_load_desktop_file_no_display_has_lower_prio_different_id (void);
-static void test_open_windows (void);
-static void test_match_desktopless_application (void);
-static void test_match_desktop_application (void);
-static void test_match_libreoffice_windows (void);
-static void test_match_gnome_control_center_panels (void);
-static void test_match_javaws_windows (void);
-static void test_match_javaws_windows_hint_ignored (void);
-static void test_match_javaws_windows_no_desktop_match (void);
-static void test_new_desktop_matches_unmatched_windows (void);
-static void test_match_transient_windows (void);
-static void test_trim_exec_string (void);
-
 static GDBusConnection *gdbus_connection = NULL;
 
 #define DOMAIN "/Matcher"
 #define DATA_DIR TESTDIR "/data"
 #define TEST_BAMF_APP_DESKTOP DATA_DIR "/test-bamf-app.desktop"
 
-void
-test_matcher_create_suite (GDBusConnection *connection)
-{
-  gdbus_connection = connection;
-
-  g_test_add_func (DOMAIN"/Allocation", test_allocation);
-  g_test_add_func (DOMAIN"/LoadDesktopFile", test_load_desktop_file);
-  g_test_add_func (DOMAIN"/LoadDesktopFile/NoDisplay/SameID", test_load_desktop_file_no_display_has_lower_prio_same_id);
-  g_test_add_func (DOMAIN"/LoadDesktopFile/NoDisplay/DifferentID", test_load_desktop_file_no_display_has_lower_prio_different_id);
-  g_test_add_func (DOMAIN"/OpenWindows", test_open_windows);
-  g_test_add_func (DOMAIN"/Matching/Application/DesktopLess", test_match_desktopless_application);
-  g_test_add_func (DOMAIN"/Matching/Application/Desktop", test_match_desktop_application);
-  g_test_add_func (DOMAIN"/Matching/Application/LibreOffice", test_match_libreoffice_windows);
-  g_test_add_func (DOMAIN"/Matching/Application/GnomeControlCenter", test_match_gnome_control_center_panels);
-  g_test_add_func (DOMAIN"/Matching/Application/JavaWebStart", test_match_javaws_windows);
-  g_test_add_func (DOMAIN"/Matching/Application/JavaWebStart/HintIngored", test_match_javaws_windows_hint_ignored);
-  g_test_add_func (DOMAIN"/Matching/Application/JavaWebStart/NoDesktopMatch", test_match_javaws_windows_no_desktop_match);
-  g_test_add_func (DOMAIN"/Matching/Windows/UnmatchedOnNewDesktop", test_new_desktop_matches_unmatched_windows);
-  g_test_add_func (DOMAIN"/Matching/Windows/Transient", test_match_transient_windows);
-  g_test_add_func (DOMAIN"/ExecStringTrimming", test_trim_exec_string);
-}
-
 static void
 export_matcher_on_bus (BamfMatcher *matcher)
 {
@@ -771,6 +733,191 @@
 }
 
 static void
+test_match_qml_app_no_desktop (void)
+{
+  BamfMatcher *matcher;
+  BamfLegacyScreen *screen;
+  BamfLegacyWindowTest *test_win;
+  BamfApplication *app1, *app2, *app3;
+
+  screen = bamf_legacy_screen_get_default ();
+  matcher = bamf_matcher_get_default ();
+  cleanup_matcher_tables (matcher);
+  export_matcher_on_bus (matcher);
+
+  guint xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "QmlApp1", NULL, "qmlscene qmlapp1.qml");
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app1 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app1));
+
+  xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "QmlApp2", NULL, "qmlscene qmlapp2.qml");
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app2 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app2));
+  g_assert (app1 != app2);
+
+  xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "QmlApp2", NULL, "qmlscene qmlapp2.qml");
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app3 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app3));
+  g_assert (app2 == app3);
+
+  g_object_unref (matcher);
+  g_object_unref (screen);
+}
+
+static void
+test_match_qml_app_desktop (void)
+{
+  BamfMatcher *matcher;
+  BamfLegacyScreen *screen;
+  BamfLegacyWindowTest *test_win;
+  BamfApplication *app1, *app2, *app3;
+
+  screen = bamf_legacy_screen_get_default ();
+  matcher = bamf_matcher_get_default ();
+  cleanup_matcher_tables (matcher);
+  export_matcher_on_bus (matcher);
+
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/bamf-qml-app.desktop");
+
+  guint xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "QmlAppWin1", NULL, "/path/qmlscene bamf_qml_app.qml");
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app1 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app1));
+  g_assert_cmpstr (bamf_application_get_desktop_file (app1), ==, DATA_DIR"/bamf-qml-app.desktop");
+
+  xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "QmlAppWin1", NULL, "qmlscene files/foo/bamf_qml_app.qml");
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app2 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app2));
+  g_assert (app1 == app2);
+
+  xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "QmlApp2", NULL, "qmlscene qmlapp2.qml");
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app3 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert (BAMF_IS_APPLICATION (app3));
+  g_assert (app2 != app3);
+
+  g_object_unref (matcher);
+  g_object_unref (screen);
+}
+
+static void
+test_match_desktop_file_hint_exec (void)
+{
+  BamfMatcher *matcher;
+  BamfLegacyScreen *screen;
+  BamfLegacyWindowTest *test_win;
+  BamfApplication *app1, *app2, *app3;
+
+  screen = bamf_legacy_screen_get_default ();
+  matcher = bamf_matcher_get_default ();
+  cleanup_matcher_tables (matcher);
+  export_matcher_on_bus (matcher);
+
+  bamf_matcher_load_desktop_file (matcher, TEST_BAMF_APP_DESKTOP);
+
+  guint xid = g_random_int ();
+  const gchar *exec = "/path/qmlscene --desktop_file_hint "TEST_BAMF_APP_DESKTOP" test-qml-app1.qml";
+  test_win = bamf_legacy_window_test_new (xid, "QmlAppWin1", NULL, exec);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app1 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert_cmpstr (bamf_application_get_desktop_file (app1), ==, TEST_BAMF_APP_DESKTOP);
+  _bamf_legacy_screen_close_test_window (screen, test_win);
+
+  xid = g_random_int ();
+  exec = "/path/qmlscene test-qml-app2.qml --desktop_file_hint "TEST_BAMF_APP_DESKTOP;
+  test_win = bamf_legacy_window_test_new (xid, "QmlAppWin2", NULL, exec);
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app2 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert_cmpstr (bamf_application_get_desktop_file (app2), ==, TEST_BAMF_APP_DESKTOP);
+  _bamf_legacy_screen_close_test_window (screen, test_win);
+
+  xid = g_random_int ();
+  exec = "test-bamf-app --desktop_file_hint "TEST_BAMF_APP_DESKTOP;
+  test_win = bamf_legacy_window_test_new (xid, "AnyAppWin1", NULL, exec);
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app3 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert_cmpstr (bamf_application_get_desktop_file (app3), ==, TEST_BAMF_APP_DESKTOP);
+
+  g_object_unref (matcher);
+  g_object_unref (screen);
+}
+
+static void
+test_match_desktop_file_hint_exec_invalid (void)
+{
+  BamfMatcher *matcher;
+  BamfLegacyScreen *screen;
+  BamfLegacyWindowTest *test_win;
+  BamfApplication *app1, *app2, *app3;
+
+  screen = bamf_legacy_screen_get_default ();
+  matcher = bamf_matcher_get_default ();
+  cleanup_matcher_tables (matcher);
+  export_matcher_on_bus (matcher);
+
+  bamf_matcher_load_desktop_file (matcher, TEST_BAMF_APP_DESKTOP);
+
+  guint xid = g_random_int ();
+  const gchar *exec = "/path/qmlscene --desktop_file_hint invalid-file.desktop test-qml-app1.qml";
+  test_win = bamf_legacy_window_test_new (xid, "QmlAppWin1", NULL, exec);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app1 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert_cmpstr (bamf_application_get_desktop_file (app1), ==, NULL);
+
+  xid = g_random_int ();
+  exec = "/path/qmlscene test-qml-app2.qml --desktop_file_hint "TEST_BAMF_APP_DESKTOP"s";
+  test_win = bamf_legacy_window_test_new (xid, "QmlAppWin2", NULL, exec);
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app2 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert_cmpstr (bamf_application_get_desktop_file (app2), ==, NULL);
+  g_assert (app2 != app1);
+  _bamf_legacy_screen_close_test_window (screen, test_win);
+
+  xid = g_random_int ();
+  exec = "test-bamf-app --desktop_file_hint invalid-file";
+  test_win = bamf_legacy_window_test_new (xid, "AnyAppWin1", NULL, exec);
+  bamf_legacy_window_test_set_wmclass (test_win, NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  app3 = bamf_matcher_get_application_by_xid (matcher, xid);
+  g_assert_cmpstr (bamf_application_get_desktop_file (app3), ==, TEST_BAMF_APP_DESKTOP);
+  g_assert (app3 != app1);
+  g_assert (app3 != app2);
+
+  g_object_unref (matcher);
+  g_object_unref (screen);
+}
+
+static void
 test_match_transient_windows (void)
 {
   BamfMatcher *matcher;
@@ -830,6 +977,10 @@
   g_assert_cmpstr (trimmed, ==, "bad-prefix-bin");
   g_free (trimmed);
 
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "gksu python very-bad-prefix-script.py");
+  g_assert_cmpstr (trimmed, ==, "very-bad-prefix-script");
+  g_free (trimmed);
+
   trimmed = bamf_matcher_get_trimmed_exec (matcher, "sudo --opt val=X /usr/bin/bad-prefix-bin");
   g_assert_cmpstr (trimmed, ==, "bad-prefix-bin");
   g_free (trimmed);
@@ -846,6 +997,22 @@
   g_assert_cmpstr (trimmed, ==, "python");
   g_free (trimmed);
 
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "/usr/bin/mono /usr/share/bar/Foo.exe");
+  g_assert_cmpstr (trimmed, ==, "foo.exe");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "/usr/bin/mono %u --option val=/path");
+  g_assert_cmpstr (trimmed, ==, "mono");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "/usr/bin/cli /usr/share/foo/Bar.exe");
+  g_assert_cmpstr (trimmed, ==, "bar.exe");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "/usr/bin/cli %u --option val=/path");
+  g_assert_cmpstr (trimmed, ==, "cli");
+  g_free (trimmed);
+
   trimmed = bamf_matcher_get_trimmed_exec (matcher, "sh -c \"binary --option --value %U || exec binary\"");
   g_assert_cmpstr (trimmed, ==, "binary");
   g_free (trimmed);
@@ -872,6 +1039,34 @@
   g_assert_cmpstr (trimmed, ==, "myprog");
   g_free (trimmed);
 
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "/usr/bin/qmlscene my-app.qml");
+  g_assert_cmpstr (trimmed, ==, "my-app");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "qmlscene /home/user/new-app.qml");
+  g_assert_cmpstr (trimmed, ==, "new-app");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "qmlscene $var /home/user/var-new-app.qml");
+  g_assert_cmpstr (trimmed, ==, "var-new-app");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "qmlscene --option -foo /home/user/opt-app.qml");
+  g_assert_cmpstr (trimmed, ==, "opt-app");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "qmlscene --desktop_file_hint deskapp.desktop desktop-app1.qml");
+  g_assert_cmpstr (trimmed, ==, "desktop-app1");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "qmlscene desktop-app2.qml --desktop_file_hint deskapp.desktop");
+  g_assert_cmpstr (trimmed, ==, "desktop-app2");
+  g_free (trimmed);
+
+  trimmed = bamf_matcher_get_trimmed_exec (matcher, "qmlscene desktop-app3.qml --desktop_file_hint");
+  g_assert_cmpstr (trimmed, ==, "desktop-app3");
+  g_free (trimmed);
+
   const char *exec = "/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java " \
                      "-Xbootclasspath/a:/usr/share/icedtea-web/netx.jar " \
                      "-Xms8m -Djava.security.manager " \
@@ -899,3 +1094,29 @@
 
   g_object_unref (matcher);
 }
+
+void
+test_matcher_create_suite (GDBusConnection *connection)
+{
+  gdbus_connection = connection;
+
+  g_test_add_func (DOMAIN"/Allocation", test_allocation);
+  g_test_add_func (DOMAIN"/ExecStringTrimming", test_trim_exec_string);
+  g_test_add_func (DOMAIN"/LoadDesktopFile", test_load_desktop_file);
+  g_test_add_func (DOMAIN"/LoadDesktopFile/NoDisplay/SameID", test_load_desktop_file_no_display_has_lower_prio_same_id);
+  g_test_add_func (DOMAIN"/LoadDesktopFile/NoDisplay/DifferentID", test_load_desktop_file_no_display_has_lower_prio_different_id);
+  g_test_add_func (DOMAIN"/OpenWindows", test_open_windows);
+  g_test_add_func (DOMAIN"/Matching/Application/Desktop", test_match_desktop_application);
+  g_test_add_func (DOMAIN"/Matching/Application/DesktopLess", test_match_desktopless_application);
+  g_test_add_func (DOMAIN"/Matching/Application/DesktopFileHintExec", test_match_desktop_file_hint_exec);
+  g_test_add_func (DOMAIN"/Matching/Application/DesktopFileHintExec/Invalid", test_match_desktop_file_hint_exec_invalid);
+  g_test_add_func (DOMAIN"/Matching/Application/LibreOffice", test_match_libreoffice_windows);
+  g_test_add_func (DOMAIN"/Matching/Application/GnomeControlCenter", test_match_gnome_control_center_panels);
+  g_test_add_func (DOMAIN"/Matching/Application/JavaWebStart", test_match_javaws_windows);
+  g_test_add_func (DOMAIN"/Matching/Application/JavaWebStart/HintIngored", test_match_javaws_windows_hint_ignored);
+  g_test_add_func (DOMAIN"/Matching/Application/JavaWebStart/NoDesktopMatch", test_match_javaws_windows_no_desktop_match);
+  g_test_add_func (DOMAIN"/Matching/Application/Qml/NoDesktopMatch", test_match_qml_app_no_desktop);
+  g_test_add_func (DOMAIN"/Matching/Application/Qml/DesktopMatch", test_match_qml_app_desktop);
+  g_test_add_func (DOMAIN"/Matching/Windows/UnmatchedOnNewDesktop", test_new_desktop_matches_unmatched_windows);
+  g_test_add_func (DOMAIN"/Matching/Windows/Transient", test_match_transient_windows);
+}
 
=== added file 'tests/data/bamf-qml-app.desktop'
--- tests/data/bamf-qml-app.desktop	1970-01-01 00:00:00 +0000
+++ tests/data/bamf-qml-app.desktop	2013-07-25 12:39:27 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Bamf Qml APP
+Exec=qmlscene bamf_qml_app.qml
+Icon=bamf-qml-icon
+Terminal=false
+Type=Application
+StartupNotify=true
+OnlyShowIn=GNOME;Unity;
 
=== added file 'tests/data/bin/qmlscene'