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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Sep 10 16:52:45 EEST 2009 
Author: kihamala
Date: 2009-09-10 16:51:22 +0300 (Thu, 10 Sep 2009)
New Revision: 19325

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
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.c
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.h
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
Log:
Revert the fix for NB#122341, it causes a regression.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-09-10 12:45:33 UTC (rev 19324)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-09-10 13:51:22 UTC (rev 19325)
@@ -1,5 +1,11 @@
 2009-09-10  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
+	Release 0.2.65
+
+	Revert the fix for NB#122341, it causes a regression.
+
+2009-09-10  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
 	Release 0.2.64
 
 2009-09-10  Adam Endrodi  <adam.endrodi at blumsoft.eu>

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-09-10 12:45:33 UTC (rev 19324)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-09-10 13:51:22 UTC (rev 19325)
@@ -1,6 +1,7 @@
-matchbox-window-manager-2 (0.2.65-1~unreleased) unstable; urgency=low
+matchbox-window-manager-2 (0.2.65-1) unstable; urgency=low
 
-  * foo
+  Kimmo:
+  * Revert the fix for NB#122341, it causes a regression.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 10 Sep 2009 15:44:03 +0300
 
@@ -13,7 +14,7 @@
   * Fixes: NB#119749 - Redundant exposure causing glitches on rotation
 
   Kimmo:
-  * Fixes: NB#122341 - Image viewer draws the content 3 times when it starts
+  * NB#122341 - Image viewer draws the content 3 times when it starts
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 10 Sep 2009 15:36:51 +0300
 

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-09-10 12:45:33 UTC (rev 19324)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-09-10 13:51:22 UTC (rev 19325)
@@ -549,10 +549,6 @@
                                             unsigned w, unsigned h);
 
 static void
-mb_wm_comp_mgr_clutter_maybe_redirect (MBWMCompMgr *mgr,
-                                       MBWindowManagerClient *c);
-
-static void
 mb_wm_comp_mgr_clutter_map_notify_real (MBWMCompMgr *mgr,
 					MBWindowManagerClient *c);
 
@@ -588,7 +584,6 @@
   cm_klass->register_client   = mb_wm_comp_mgr_clutter_register_client_real;
   cm_klass->turn_on           = mb_wm_comp_mgr_clutter_turn_on_real;
   cm_klass->turn_off          = mb_wm_comp_mgr_clutter_turn_off_real;
-  cm_klass->maybe_redirect    = mb_wm_comp_mgr_clutter_maybe_redirect;
   cm_klass->map_notify        = mb_wm_comp_mgr_clutter_map_notify_real;
   cm_klass->my_window         = mb_wm_comp_mgr_is_my_window_real;
   cm_klass->restack           = mb_wm_comp_mgr_clutter_restack_real;
@@ -1124,19 +1119,6 @@
 }
 
 static void
-mb_wm_comp_mgr_clutter_maybe_redirect (MBWMCompMgr *mgr,
-                                       MBWindowManagerClient *c)
-{
-  if (c->xwin_frame)
-    {
-      /* Use CompositeRedirectManual since the frame's immediate child
-       * is using that, see mb_wm_comp_mgr_clutter_set_client_redirection */
-      XCompositeRedirectSubwindows (c->wmref->xdpy, c->xwin_frame,
-                                    CompositeRedirectManual);
-    }
-}
-
-static void
 mb_wm_comp_mgr_clutter_map_notify_real (MBWMCompMgr *mgr,
 					MBWindowManagerClient *c)
 {

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.c	2009-09-10 12:45:33 UTC (rev 19324)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.c	2009-09-10 13:51:22 UTC (rev 19325)
@@ -319,23 +319,6 @@
     klass->restack (mgr);
 }
 
-/* Called for each client to possibly redirect the client before reparenting.
- * This will save one redraw of the client. See NB#122341 */
-void __attribute__ ((visibility("hidden")))
-mb_wm_comp_mgr_client_maybe_redirect (MBWMCompMgr *mgr,
-                                      MBWindowManagerClient *c)
-{
-  MBWMCompMgrClass *klass;
-
-  if (!mgr)
-    return;
-
-  klass = MB_WM_COMP_MGR_CLASS (MB_WM_OBJECT_GET_CLASS (mgr));
-
-  if (klass->maybe_redirect)
-    klass->maybe_redirect (mgr, c);
-}
-
 /*
  * Called when a window we are interested in maps.
  */

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.h	2009-09-10 12:45:33 UTC (rev 19324)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr.h	2009-09-10 13:51:22 UTC (rev 19325)
@@ -58,7 +58,6 @@
   void   (*turn_off)          (MBWMCompMgr * mgr);
   void   (*render)            (MBWMCompMgr * mgr);
   void   (*restack)           (MBWMCompMgr * mgr);
-  void   (*maybe_redirect)    (MBWMCompMgr * mgr, MBWindowManagerClient *c);
   void   (*map_notify)        (MBWMCompMgr * mgr, MBWindowManagerClient *c);
   void   (*unmap_notify)      (MBWMCompMgr * mgr, MBWindowManagerClient *c);
   Bool   (*handle_damage)     (XDamageNotifyEvent * xev, MBWMCompMgr * mgr);
@@ -172,8 +171,5 @@
 void
 mb_wm_comp_mgr_client_configure (MBWMCompMgrClient * client);
 
-void __attribute__ ((visibility("hidden")))
-mb_wm_comp_mgr_client_maybe_redirect (MBWMCompMgr *mgr,
-                                      MBWindowManagerClient *c);
 
 #endif

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-09-10 12:45:33 UTC (rev 19324)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-09-10 13:51:22 UTC (rev 19325)
@@ -234,10 +234,6 @@
       g_debug("frame for window 0x%lx is 0x%lx",
               client->window->xwindow, client->xwin_frame);
 
-#if ENABLE_COMPOSITE
-      mb_wm_comp_mgr_client_maybe_redirect (wm->comp_mgr, client);
-#endif
-
       /*
        * Assume geometry sync will fix this up correctly
        * together with any decoration creation. Layout
More information about the maemo-commits mailing list