[maemo-commits] [maemo-commits] r17631 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-03-10 18:26:18 +0200 (Tue, 10 Mar 2009)
New Revision: 17631

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-stack.c
Log:
        Fixes: NB#104487
	* matchbox/core/mb-window-manager.c: further to my previous
	fix, let's just say that only MBWMClientTypeDialog can be
	system-modal.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-10 14:03:22 UTC (rev 17630)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-10 16:26:18 UTC (rev 17631)
@@ -1,3 +1,11 @@
+2009-03-10  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+        Fixes: NB#104487
+	
+	* matchbox/core/mb-window-manager.c: further to my previous
+	fix, let's just say that only MBWMClientTypeDialog can be
+	system-modal.
+
 2009-03-10  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.20

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-03-10 14:03:22 UTC (rev 17630)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-03-10 16:26:18 UTC (rev 17631)
@@ -1958,11 +1958,6 @@
     *last_focused_transient,
     *focused_clients_parent;
 
-  /* types of clients that can't be system modal */
-  const int cannot_be_system_modal =
-    MBWMClientTypePanel |
-    MBWMClientTypeDesktop;
- 
   last_focused_transient = mb_wm_client_get_last_focused_transient (c);
 
   focused_clients_parent = wm->focused_client?
@@ -2006,7 +2001,7 @@
       (wm->modality_type == MBWMModalitySystem &&
        !focused_clients_parent &&
        wm->focused_client &&
-       !(MB_WM_CLIENT_CLIENT_TYPE (wm->focused_client) & cannot_be_system_modal) &&
+       MB_WM_CLIENT_CLIENT_TYPE (wm->focused_client)==MBWMClientTypeDialog &&
        mb_wm_client_get_transient_for (client) &&
        wm->focused_client != mb_wm_client_get_transient_for (client))
       )

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-stack.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-stack.c	2009-03-10 14:03:22 UTC (rev 17630)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-stack.c	2009-03-10 16:26:18 UTC (rev 17631)
@@ -71,12 +71,13 @@
 
       stacking_layer = mb_wm_client_get_stacking_layer (client);
 
-      g_debug ("%s XID: %lx NAME: %s, type %d, layer %d\n",
+      g_debug ("%s XID: %lx NAME: %s, type %d, layer %d%s\n",
 	      prefix,
 	      MB_WM_CLIENT_XWIN(client),
 	      client->window->name ? client->window->name : "unknown",
 	      MB_WM_CLIENT_CLIENT_TYPE (client),
-	      stacking_layer);
+	      stacking_layer,
+              wm->focused_client==client? " FOCUSED":"" );
     }
 
   g_debug ("======================\n\n");
@@ -141,7 +142,7 @@
     }
 
 //  ENABLE ME WHEN YOU NEED ME
-//  mb_wm_stack_dump (wm, "FINISH");
+ mb_wm_stack_dump (wm, "FINISH");
 }
 
 void