Merge lp:~3v1n0/bamf/safer-pid-desktop-registration into lp:bamf

[Marco Trevisan (Treviño)]

BamfMatcher: don't assign no-display desktop files to windows by default when launched

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:654
http://jenkins.qa.ubuntu.com/job/bamf-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/3/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2015-11-03 10:02:51 +0000
+++ src/bamf-matcher.c	2015-11-24 15:04:30 +0000
@@ -2357,28 +2357,49 @@
 {
   gpointer key;
   BamfLegacyScreen *screen;
-  GList *windows, *l;
+  GList *windows, *pids, *l, *ll;
+  gboolean matching_window_found;
 
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (desktop_file);
 
-  if (is_autostart_desktop_file (desktop_file))
+  if (is_no_display_desktop (self, desktop_file) || is_autostart_desktop_file (desktop_file))
     return;
 
   key = GUINT_TO_POINTER (pid);
   g_hash_table_insert (self->priv->registered_pids, key, g_strdup (desktop_file));
 
-  /* fixme, this is a bit heavy */
-
   screen = bamf_legacy_screen_get_default ();
-
   g_return_if_fail (BAMF_IS_LEGACY_SCREEN (screen));
 
   windows = bamf_legacy_screen_get_windows (screen);
+  matching_window_found = FALSE;
 
   for (l = windows; l; l = l->next)
     {
-      ensure_window_hint_set (self, l->data);
+      BamfLegacyWindow *window = l->data;
+
+      if (!BAMF_IS_LEGACY_WINDOW (window))
+        continue;
+
+      pids = pid_parent_tree (self, bamf_legacy_window_get_pid (window));
+
+      for (ll = pids; ll; ll = ll->next)
+        {
+          if (pid == GPOINTER_TO_UINT (ll->data))
+            {
+              matching_window_found = TRUE;
+              break;
+            }
+        }
+
+      g_list_free (pids);
+
+      if (matching_window_found)
+        {
+          ensure_window_hint_set (self, window);
+          break;
+        }
     }
 }
 
 
=== modified file 'tests/bamfdaemon/test-matcher.c'
--- tests/bamfdaemon/test-matcher.c	2015-10-29 18:22:53 +0000
+++ tests/bamfdaemon/test-matcher.c	2015-11-24 15:04:30 +0000
@@ -264,6 +264,42 @@
 }
 
 static void
+test_register_desktop_for_pid_display (void)
+{
+  BamfMatcher *matcher = bamf_matcher_get_default ();
+  BamfMatcherPrivate *priv = matcher->priv;
+  guint pid = g_random_int ();
+  const gchar *desktop = DATA_DIR"/test-bamf-app-display.desktop";
+
+  cleanup_matcher_tables (matcher);
+  bamf_matcher_load_desktop_file (matcher, desktop);
+  bamf_matcher_register_desktop_file_for_pid (matcher, desktop, pid);
+
+  desktop = g_hash_table_lookup (priv->registered_pids, GUINT_TO_POINTER (pid));
+  g_assert_cmpstr (desktop, ==, DATA_DIR"/test-bamf-app-display.desktop");
+
+  g_object_unref (matcher);
+}
+
+static void
+test_register_desktop_for_pid_nodisplay (void)
+{
+  BamfMatcher *matcher = bamf_matcher_get_default ();
+  BamfMatcherPrivate *priv = matcher->priv;
+  guint pid = g_random_int ();
+  const gchar *desktop = DATA_DIR"/test-bamf-app-no-display.desktop";
+
+  cleanup_matcher_tables (matcher);
+  bamf_matcher_load_desktop_file (matcher, desktop);
+  bamf_matcher_register_desktop_file_for_pid (matcher, desktop, pid);
+
+  desktop = g_hash_table_lookup (priv->registered_pids, GUINT_TO_POINTER (pid));
+  g_assert_cmpstr (desktop, ==, NULL);
+
+  g_object_unref (matcher);
+}
+
+static void
 test_open_windows (void)
 {
   BamfMatcher *matcher;
@@ -1265,4 +1301,6 @@
   g_test_add_func (DOMAIN"/RegisterDesktopForPid", test_register_desktop_for_pid);
   g_test_add_func (DOMAIN"/RegisterDesktopForPid/BigNumber", test_register_desktop_for_pid_big_number);
   g_test_add_func (DOMAIN"/RegisterDesktopForPid/Autostart", test_register_desktop_for_pid_autostart);
+  g_test_add_func (DOMAIN"/RegisterDesktopForPid/Display", test_register_desktop_for_pid_display);
+  g_test_add_func (DOMAIN"/RegisterDesktopForPid/NoDisplay", test_register_desktop_for_pid_nodisplay);
 }