Merge lp:~bregma/bamf/lp-1415052 into lp:bamf

[Stephen M. Webb]

fixed Ubuntu packaging for multi-arch

Fix Ubuntu packaging for multi-arch.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~bregma/bamf/lp-1415052]

606. By Stephen M. Webb on 2015-01-27

merged lp:~larsu/bamf/lp1407711 to pick up an unrelated change for Ubuntu lcov version bump

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:606
http://jenkins.qa.ubuntu.com/job/bamf-ci/116/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-wily-amd64-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/bamf-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-04-07 21:31:21 +0000
+++ debian/control	2015-01-27 17:12:48 +0000
@@ -93,6 +93,7 @@
 Package: gir1.2-bamf-3
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${misc:Depends},
 Description: GObject introspection data for the Bamf library

=== modified file 'debian/gir1.2-bamf-3.install'
--- debian/gir1.2-bamf-3.install	2012-12-19 21:57:09 +0000
+++ debian/gir1.2-bamf-3.install	2015-01-27 17:12:48 +0000
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/Bamf-*.typelib
+usr/lib/*/girepository-1.0/Bamf-*.typelib

=== modified file 'm4/gcov.m4'
--- m4/gcov.m4	2014-01-08 18:36:02 +0000
+++ m4/gcov.m4	2015-01-27 17:12:48 +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-27 17:12:48 +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-27 17:12:48 +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;