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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-02-07 23:28:59 +0200 (Sat, 07 Feb 2009)
New Revision: 17369

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
Log:
avoid double registration of clients to the compositor


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-06 12:34:38 UTC (rev 17368)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-07 21:28:59 UTC (rev 17369)
@@ -1,3 +1,10 @@
+2009-02-07  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-window-manager.c (mb_wm_manage_client): Do not
+	register an already registered client to the compositor.
+	(mb_wm_manage_preexistsing_wins): Renamed to
+	mb_wm_manage_preexisting_wins.
+
 2009-02-05  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	* matchbox/core/mb-wm-root-window.c:

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-02-06 12:34:38 UTC (rev 17368)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-02-07 21:28:59 UTC (rev 17369)
@@ -1156,7 +1156,7 @@
     sync_flags |= MBWMSyncStacking;
 
 #if ENABLE_COMPOSITE
-  if (mb_wm_comp_mgr_enabled (wm->comp_mgr))
+  if (mb_wm_comp_mgr_enabled (wm->comp_mgr) && !client->cm_client)
     mb_wm_comp_mgr_register_client (wm->comp_mgr, client);
 #endif
 
@@ -1338,7 +1338,7 @@
 }
 
 static void
-mb_wm_manage_preexistsing_wins (MBWindowManager* wm)
+mb_wm_manage_preexisting_wins (MBWindowManager* wm)
 {
    unsigned int      nwins, i;
    Window            foowin1, foowin2, *wins;
@@ -1570,7 +1570,7 @@
     mb_wm_compositing_on (wm);
 #endif
 
-  mb_wm_manage_preexistsing_wins (wm);
+  mb_wm_manage_preexisting_wins (wm);
 
   /*
    * Force an initial stack sync even when there are no managed windows (when