Merge lp:~robertcarr/bamf/ignore-shell-windows into lp:bamf/0.4

[Robert Carr]

Ignore BAMF_WINDOW_UTILITY and BAMF_WINDOW_DOCK windows for application matching.

Ignore UTILITY and DOCK windows for application matching.

[lp:~robertcarr/bamf/ignore-shell-windows]

455. By Robert Carr on 2012-03-19

Cleanup

Unmerged revisions

455. By Robert Carr on 2012-03-19

Cleanup

454. By Robert Carr on 2012-03-19

Ensure that we ignore shell windoows in bamf-matcher

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-02-10 20:05:54 +0000
+++ src/bamf-matcher.c	2012-03-19 18:20:23 +0000
@@ -1926,10 +1926,20 @@
 static void
 handle_window_opened (BamfLegacyScreen * screen, BamfLegacyWindow * window, BamfMatcher *self)
 {
+  BamfWindowType window_type;
+
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
 
-  if (bamf_legacy_window_get_window_type (window) == BAMF_WINDOW_DESKTOP)
+  window_type = bamf_legacy_window_get_window_type (window);
+
+  /* Ignore shell windows*/
+  if (window_type == BAMF_WINDOW_DOCK || window_type == BAMF_WINDOW_UTILITY)
+    {
+      return;
+    }
+
+  else if (window_type == BAMF_WINDOW_DESKTOP)
     {
       BamfWindow *bamfwindow;
       
@@ -1940,7 +1950,7 @@
       return;
     }
 
-  if (is_open_office_window (self, window))
+  else if (is_open_office_window (self, window))
     {
       BamfWindowType win_type = bamf_legacy_window_get_window_type (window);
 
@@ -1979,8 +1989,10 @@
 
       g_free (old_hint);
     }
-
-  /* we have a window who is ready to be matched */
+  
+  /* 
+   * We have a window who is ready to be matched.
+   */
   handle_raw_window (self, window);
 }