Merge lp:~larsu/bamf/fixup-gtk-application-matching into lp:bamf

[Lars Karlitski]

Matcher: use desktop file path when matching on _GTK_APPLICATION_ID

Previously, bamf_application_get_application_desktop_file() would return the bare id in those cases.

Matcher: use desktop file path when matching on _GTK_APPLICATION_ID

Previously, bamf_application_get_application_desktop_file() would return the bare id in those cases.

[lp:~larsu/bamf/fixup-gtk-application-matching]

610. By Lars Karlitski on 2015-01-29

Matcher: fix memory leak

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:610
http://jenkins.qa.ubuntu.com/job/bamf-ci/109/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/5
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/109/rebuild

review: Needs Fixing (continuous-integration)

[Rico Tzschichholz (ricotz)]

I tested it and it fixes the issue, I had, for me.

[lp:~larsu/bamf/fixup-gtk-application-matching]

611. By Marco Trevisan (Treviño) on 2015-02-02

matcher: look for app ids only if desktop_file is not set

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

+1

review: Approve

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2015-01-12 11:01:36 +0000
+++ src/bamf-matcher.c	2015-02-02 09:57:30 +0000
@@ -1617,7 +1617,7 @@
   BamfMatcherPrivate *priv;
   BamfLegacyWindow *window;
   GList *desktop_files = NULL, *l;
-  gchar *app_id;
+  char *app_id;
   char *desktop_file = NULL;
   const char *desktop_class = NULL;
   const char *class_name = NULL;
@@ -1630,7 +1630,6 @@
 
   priv = self->priv;
   window = bamf_window_get_window (bamf_window);
-  app_id = bamf_legacy_window_get_hint (window, _GTK_APPLICATION_ID);
   desktop_file = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
   class_name = bamf_legacy_window_get_class_name (window);
   instance_name = bamf_legacy_window_get_class_instance_name (window);
@@ -1658,14 +1657,6 @@
         }
     }
 
-  if (app_id)
-    {
-      if (g_hash_table_contains (priv->desktop_id_table, app_id))
-        desktop_files = g_list_prepend (desktop_files, app_id);
-      else
-        g_free (app_id);
-    }
-
   if (desktop_file)
     {
       desktop_class = bamf_matcher_get_desktop_file_class (self, desktop_file);
@@ -1688,6 +1679,26 @@
         {
           desktop_files = g_list_prepend (desktop_files, desktop_file);
         }
+      else
+        {
+          app_id = bamf_legacy_window_get_hint (window, _GTK_APPLICATION_ID);
+
+          if (app_id)
+            {
+              for (l = g_hash_table_lookup (priv->desktop_id_table, app_id); l; l = l->next)
+                {
+                  desktop_file = l->data;
+                  desktop_class = bamf_matcher_get_desktop_file_class (self, desktop_file);
+
+                  if ((!filter_by_wmclass && !desktop_class) || g_strcmp0 (desktop_class, target_class) == 0)
+                    {
+                      desktop_files = g_list_prepend (desktop_files, g_strdup (desktop_file));
+                    }
+                }
+
+              g_free (app_id);
+            }
+        }
     }
 
   desktop_file = NULL;