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

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-04-26 06:05:53 +0300 (Sun, 26 Apr 2009)
New Revision: 18162

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-root-window.c
Log:
NB#105384

Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-24 13:46:19 UTC (rev 18161)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-26 03:05:53 UTC (rev 18162)
@@ -1,3 +1,10 @@
+2009-04-25  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+        * matchbox/core/mb-wm-root-window.c:
+        new flag to mean that a window should only be closed if
+        it's topmost.
+        Fixes NB#105384.
+
 2009-04-22  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c:

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-root-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-root-window.c	2009-04-24 13:46:19 UTC (rev 18161)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-root-window.c	2009-04-26 03:05:53 UTC (rev 18162)
@@ -360,8 +360,20 @@
     }
   else if (e->message_type == wm->atoms[MBWM_ATOM_NET_CLOSE_WINDOW])
     {
-      if ((c = mb_wm_managed_client_from_xwindow(wm, e->window)) != NULL)
-	mb_wm_client_deliver_delete(c);
+      if ((c = mb_wm_managed_client_from_xwindow(wm, e->window)) != NULL) {
+	if ((e->data.l[2] & 1) && mb_wm_client_get_next_focused_client(c)!=NULL )
+	  {
+	    /* If they set the least significant bit of data.l[2],
+	     * the window should only be closed if it is topmost.
+	     */
+	    g_warning ("Not closing %07x because it is not on top\n",
+		       (int) e->window);
+	  }
+	else
+	  {
+	    mb_wm_client_deliver_delete(c);
+	  }
+      }
 
       return 1;
     }