[maemo-commits] [maemo-commits] r18872 - in projects/haf/trunk/libmatchbox2: . debian matchbox/comp-mgr

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-07-20 09:35:13 +0300 (Mon, 20 Jul 2009)
New Revision: 18872

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:
apply patch from Artem


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-17 14:07:11 UTC (rev 18871)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-20 06:35:13 UTC (rev 18872)
@@ -1,3 +1,11 @@
+2009-07-20  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Patch from Artem for NB#126898.
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+	(mb_wm_comp_mgr_clutter_restack_real): Don't restack if
+	MBWMCompMgrClutterClientDontShow is set.
+
 2009-07-17  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	NB#128595 [RGBA GTK+/sapwood] modalblocker popping up without
@@ -14,10 +22,10 @@
 
 2009-07-17  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
-	* matchbox/core/mb-wm-stack.c: If an application has non-application-modal
-	windows stacked above application-modal windows, force the application-modal
-	windows to the top; otherwise the application will appear to have locked up.
-	Fixes NB#115408.
+	* matchbox/core/mb-wm-stack.c: If an application has
+	non-application-modal windows stacked above application-modal windows,
+	force the application-modal windows to the top; otherwise the
+	application will appear to have locked up. Fixes NB#115408.
 
 2009-07-16  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
@@ -42,7 +50,8 @@
 	* matchbox/core/mb-wm-client.c:
 	 If this transient already has a registered transient parent we 
 	 need to remove the link from the parent.
-	 Fixes: NB#125222 - Hildon-desktop crashed when image opened from File Manager.
+	 Fixes: NB#125222 - Hildon-desktop crashed when image opened from
+	 File Manager.
 
 2009-07-03  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-07-17 14:07:11 UTC (rev 18871)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-07-20 06:35:13 UTC (rev 18872)
@@ -1,9 +1,16 @@
 matchbox-window-manager-2 (0.2.48-1~unreleased) unstable; urgency=low
 
-  * new
+  Adam:
+  * Fixes: NB#128595 - [RGBA GTK+/sapwood] modalblocker popping up without
+    a dialog locks the UI
+  * Fixes: NB#128661 - [RGBA GTK+/sapwood] Application windows not mapped,
+    only titlebar visible.
 
- -- Aapo Kojo <aapo.kojo at nokia.com>  Fri, 17 Jul 2009 12:48:13 +0300
+  Kimmo:
+  * Patch from Artem for NB#126898.
 
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 20 Jul 2009 09:31:45 +0300
+
 matchbox-window-manager-2 (0.2.47-1) unstable; urgency=low
 
   Thomas:

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-07-17 14:07:11 UTC (rev 18871)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-07-20 06:35:13 UTC (rev 18872)
@@ -904,7 +904,9 @@
 
 	      a = cc->priv->actor;
 
-	      if (!a || clutter_actor_get_parent (a) != desktop)
+	      if (!a ||
+		  clutter_actor_get_parent (a) != desktop ||
+		  cc->priv->flags & MBWMCompMgrClutterClientDontShow)
 		continue;
 
 	      clutter_actor_raise (a, prev);