Merge lp:~larsu/bamf/lp1407711 into lp:bamf

[Lars Karlitski]

Matcher: honor the _GTK_APPLICATION_ID xprop

And give it priority over _NET_WM_DESKTOP_FILE if the application has a matching desktop file installed.

Matcher: honor the _GTK_APPLICATION_ID xprop

And give it priority over _NET_WM_DESKTOP_FILE if the application has a matching desktop file installed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:605
http://jenkins.qa.ubuntu.com/job/bamf-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/1/console

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

review: Needs Fixing (continuous-integration)

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

Looks good, just a small fix is needed.

As for the grouping, we should probably keep a list of applications for each app_id, and as soon as we find a window with a matching app-id we'll ignore all the other tests and assign that window for the given Bamf app.

[lp:~larsu/bamf/lp1407711]

606. By Lars Karlitski on 2015-01-12

Matcher: fix a memory leak

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

Looks good

review: Approve

[lp:~larsu/bamf/lp1407711]

607. By Lars Karlitski on 2015-01-12

m4: update accepted lcov versions

[Rico Tzschichholz (ricotz)]

This breaks "bamf_application_get_desktop_file" which starts to return this favored application_id in contradiction to its purpose and documented behavior.

review: Needs Information

=== modified file 'm4/gcov.m4'
--- m4/gcov.m4	2014-01-08 18:36:02 +0000
+++ m4/gcov.m4	2015-01-12 11:13:42 +0000
@@ -33,7 +33,7 @@
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9 1.10"
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
 

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2014-04-09 16:59:37 +0000
+++ src/bamf-matcher.c	2015-01-12 11:13:42 +0000
@@ -1617,6 +1617,7 @@
   BamfMatcherPrivate *priv;
   BamfLegacyWindow *window;
   GList *desktop_files = NULL, *l;
+  gchar *app_id;
   char *desktop_file = NULL;
   const char *desktop_class = NULL;
   const char *class_name = NULL;
@@ -1629,6 +1630,7 @@
 
   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);
@@ -1656,6 +1658,14 @@
         }
     }
 
+  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);

=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h	2013-08-07 15:50:56 +0000
+++ src/bamf-matcher.h	2015-01-12 11:13:42 +0000
@@ -46,6 +46,7 @@
 #define BAMF_MATCHER_GET_CLASS(obj)             (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))
 
 #define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"
+#define _GTK_APPLICATION_ID "_GTK_APPLICATION_ID"
 
 typedef struct _BamfMatcher BamfMatcher;
 typedef struct _BamfMatcherClass BamfMatcherClass;