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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-30 11:19:58 +0300 (Thu, 30 Apr 2009)
New Revision: 18200

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
another Laszlo patch for Bug 110527


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-30 08:12:09 UTC (rev 18199)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-30 08:19:58 UTC (rev 18200)
@@ -1,6 +1,6 @@
 2009-04-30  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
-	Apply a second patch from Laszlo Pere for NB#106208.
+	Apply a second patch from Laszlo Pere for NB#106208:
 
 	* matchbox/client-types/mb-wm-client-app.c (mb_wm_client_app_init):
 	Set transiency properly if the parent is mapped after the child (in
@@ -10,6 +10,14 @@
 	matchbox/core/mb-wm-object.h: Add macros for checking type of the
 	parent class.
 
+	Apply another patch from Laszlo for NB#110527:
+
+	* matchbox/core/mb-wm-client-window.c (mb_wm_client_window_init): Call
+	XSelectInput here instead of in mb_wm_client_base_realize, so it's
+	done earlier.
+	* matchbox/core/mb-wm-client-base.c (mb_wm_client_base_realize):
+	Removed call for XSelectInput.
+
 2009-04-30  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	Fix for missing textures after restarting the wm.

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-30 08:12:09 UTC (rev 18199)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-30 08:19:58 UTC (rev 18200)
@@ -6,6 +6,8 @@
 
   Laszlo:
   * Fixes: NB#106208 - Wrong window shown after pushing 2 windows
+  * Fixes: NB#110527 - Adding two window to stack using
+    hildon_window_stack_push, topmost window is black
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 27 Apr 2009 17:32:26 +0300
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-04-30 08:12:09 UTC (rev 18199)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-04-30 08:19:58 UTC (rev 18200)
@@ -276,10 +276,6 @@
   XSetWindowBorderWidth(wm->xdpy, MB_WM_CLIENT_XWIN(client), 0);
 
   XAddToSaveSet(wm->xdpy, MB_WM_CLIENT_XWIN(client));
-
-  XSelectInput(wm->xdpy,
-	       MB_WM_CLIENT_XWIN(client),
-	       PropertyChangeMask);
 }
 
 /*

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-04-30 08:12:09 UTC (rev 18199)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-04-30 08:19:58 UTC (rev 18200)
@@ -124,6 +124,14 @@
 
   win->xwindow = xwin;
   win->wm = wm;
+ 
+  /*
+   * We need to call XSelectInput() so we are going to be notified about the
+   * WM_TRANSIENT_FOR changes.
+   */
+  XSelectInput(wm->xdpy,
+	       xwin,
+	       PropertyChangeMask);
 
   /* TODO: handle properties after discovering them. E.g. fullscreen.
    * See NB#97342 */