Merge lp:~3v1n0/bamf/new-desktop-rematch into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfMatcher: when a new .desktop file is added, try to rematch it to opened applications

Now, when a new .desktop file is added to the monitored folders bamf tries to match it to one of the windows we have that has not a .desktop file associated.

This fixes desktopless newly created Chromium apps.

[Jason Smith (jassmith)]

Looks good, instead of l and ll can you pick more meaningful names? The nesting makes it confusing.

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-05-22 16:19:49 +0000
+++ src/bamf-matcher.c	2012-05-22 17:06:20 +0000
@@ -2247,6 +2247,8 @@
 bamf_matcher_load_desktop_file (BamfMatcher * self,
                                 const char * desktop_file)
 {
+  GList *vl, *wl;
+
   g_return_if_fail (BAMF_IS_MATCHER (self));
 
   load_desktop_file_to_table (self,
@@ -2254,6 +2256,36 @@
                               self->priv->desktop_file_table,
                               self->priv->desktop_id_table,
                               self->priv->desktop_class_table);
+
+  /* If an application with no .desktop file has windows that matches
+   * the new added .desktop file, then we try to re-match them. */
+  for (vl = self->priv->views; vl; vl = vl->next)
+    {
+      if (!BAMF_IS_APPLICATION (vl->data))
+        continue;
+
+      BamfApplication *app = BAMF_APPLICATION (vl->data);
+
+      if (!bamf_application_get_desktop_file (app))
+        {
+          GList *children = bamf_view_get_children (BAMF_VIEW (app));
+
+          for (wl = children; wl; wl = wl->next)
+          {
+            if (!BAMF_IS_WINDOW (wl->data))
+              continue;
+
+            BamfWindow *win = BAMF_WINDOW (wl->data);
+            GList *desktops = bamf_matcher_possible_applications_for_window (self, win, NULL);
+
+            if (g_list_find_custom (desktops, desktop_file, (GCompareFunc) g_strcmp0))
+              {
+                BamfLegacyWindow *legacy_window = bamf_window_get_window (win);
+                bamf_legacy_window_reopen (legacy_window);
+              }
+          }
+        }
+    }
 }
 
 void