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

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-05-27 11:45:04 +0300 (Wed, 27 May 2009)
New Revision: 18502

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
Log:
	NB#112098 HildonProgram's is-topmost property is behaving oddly

	This is rather a fix for NB#115761 but magomez says it closes the
	parent bug as well.  What's happened in NB#112098 is not clear but
	with the later camera changed its fullscreenness while it was zooming
	out, which caused its reactivation.

	* matchbox/core/mb-wm-client.c (mb_wm_client_set_state):
	  Don't (re)activate the client when it's changing state.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-27 08:39:17 UTC (rev 18501)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-27 08:45:04 UTC (rev 18502)
@@ -1,3 +1,15 @@
+2009-05-27  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	NB#112098 HildonProgram's is-topmost property is behaving oddly
+
+	This is rather a fix for NB#115761 but magomez says it closes the
+	parent bug as well.  What's happened in NB#112098 is not clear but
+	with the later camera changed its fullscreenness while it was zooming
+	out, which caused its reactivation.
+
+	* matchbox/core/mb-wm-client.c (mb_wm_client_set_state):
+	  Don't (re)activate the client when it's changing state.
+
 2009-05-25  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.40

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-05-27 08:39:17 UTC (rev 18501)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-05-27 08:45:04 UTC (rev 18502)
@@ -836,7 +836,6 @@
   MBWMClientWindow  *win = client->window;
   Bool               old_state;
   Bool               new_state = False;
-  Bool               activate = True;
   MBWMClientWindowEWMHState state_flag;
 
   switch (state)
@@ -905,14 +904,13 @@
   if ((state_flag & MBWMClientWindowEWMHStateFullscreen))
     {
       mb_wm_client_fullscreen_mark_dirty (client);
+      mb_wm_display_sync_queue (wm, MBWMSyncStacking);
     }
 
   /*
    * FIXME -- resize && move, possibly redraw decors when returning from
    * fullscreen
    */
-  if (activate) 
-    mb_wm_activate_client(wm, client);
 }
 
 Bool