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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-02-25 17:16:18 +0200 (Wed, 25 Feb 2009)
New Revision: 17514

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:
remove xmas hack for systemui


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-25 13:27:01 UTC (rev 17513)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-02-25 15:16:18 UTC (rev 17514)
@@ -1,3 +1,10 @@
+2009-02-25  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+	(mb_wm_comp_mgr_clutter_client_configure_real): Remove the "xmas hack"
+	for systemui menus. Apparently this hasn't been effective anyway
+	because systemui is now using the notification type.
+
 2009-02-25  Gordon Williams  <gordon.williams at collabora.co.uk>
 
 	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c:

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-02-25 13:27:01 UTC (rev 17513)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-02-25 15:16:18 UTC (rev 17514)
@@ -705,15 +705,7 @@
     {
       cclient->priv->fullscreen = fullscreen;
 
-      /* FIXME xmas fix -- ignore the invisible systemui dialog, because it
-       * would show as white window for some reason */
-      if (!(ctype == MBWMClientTypeMenu &&
-          g_strcmp0 ("systemui", wm_client->window->name) == 0))
-        {
-          mb_wm_comp_mgr_clutter_fetch_texture (client);
-        }
-      else
-        g_debug("%s: skip systemui dialog", __FUNCTION__);
+      mb_wm_comp_mgr_clutter_fetch_texture (client);
     }
 
   /* Don't touch clients that handle their own actor positioning */