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

Thu Apr 30 13:01:10 EEST 2009

Author: kihamala
Date: 2009-04-30 13:01:08 +0300 (Thu, 30 Apr 2009)
New Revision: 18201

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.c
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.h
   projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-dialog.h
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-object.h
Log:
revert Laszlo's patches, update debian/changelog


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================

--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-30 08:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-30 10:01:08 UTC (rev 18201)
@@ -1,23 +1,3 @@
-2009-04-30  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
-
-	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
-	transiency sense).
-	* matchbox/client-types/mb-wm-client-app.h,
-	matchbox/client-types/mb-wm-client-dialog.h,
-	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:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-30 10:01:08 UTC (rev 18201)
@@ -1,14 +1,16 @@
 matchbox-window-manager-2 (0.2.36-1~unreleased) unstable; urgency=low
 
-  Thomas:
-  * A fix related to NB#101437 - Invoking CSM on the left side of page area is
-    displayed in wrong location. (Works when widget side has been fixed.)
+  Adam:
+  * Fix for missing textures after restarting the wm.
+  * Reliability fixes.  Do not freak out when the wm is restarted
+    with a fullscreen application in front.
 
-  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
+  Marc:
+  * Fixed handling of _NET_WM_PID property.
 
+  Kimmo:
+  * Minor Coverity fixes & remove FIXME'd code.
+
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 27 Apr 2009 17:32:26 +0300
 
 matchbox-window-manager-2 (0.2.35-1) unstable; urgency=low

Modified: projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.c	2009-04-30 08:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.c	2009-04-30 10:01:08 UTC (rev 18201)
@@ -1,8 +1,4 @@
 #include "mb-wm-client-app.h"
-#include "mb-wm-client-dialog.h"
-#include "mb-wm-client-menu.h"
-#include "mb-wm-client-override.h"
-#include "mb-wm-client-input.h"
 
 #include "mb-wm-theme.h"
 
@@ -103,29 +99,6 @@
       mb_wm_theme_create_decor (wm->theme, client, MBWMDecorTypeEast);
     }
 
-  /*
-   * The transient parent might be mapped after the client is mapped so we go
-   * back and if we find the client we register the transient parent now.
-   */
-  MBWMList *l = wm->clients;
-  MBWindowManagerClient *c;
-  while (l)
-    {
-       c = l->data;
-       if (c->window->xwin_transient_for &&
-           client->window->xwindow == c->window->xwin_transient_for &&
-           (MB_WM_IS_CLIENT_APP(c) || MB_WM_PARENT_IS_CLIENT_APP(c) ||
-            MB_WM_IS_CLIENT_DIALOG(c) || MB_WM_PARENT_IS_CLIENT_DIALOG(c) ||
-            MB_WM_IS_CLIENT_MENU(c) ||
-            MB_WM_IS_CLIENT_OVERRIDE(c) ||
-            MB_WM_IS_CLIENT_INPUT(c))) {
-         mb_wm_client_add_transient (client, c);
-         c->stacking_layer = client->stacking_layer;
-       }
-       
-       l = l->next;
-    }
-
   return 1;
 }
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.h	2009-04-30 08:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-app.h	2009-04-30 10:01:08 UTC (rev 18201)
@@ -30,7 +30,6 @@
 #define MB_WM_CLIENT_APP_CLASS(c) ((MBWMClientAppClass*)(c))
 #define MB_WM_TYPE_CLIENT_APP (mb_wm_client_app_class_type ())
 #define MB_WM_IS_CLIENT_APP(c) (MB_WM_OBJECT_TYPE(c)==MB_WM_TYPE_CLIENT_APP)
-#define MB_WM_PARENT_IS_CLIENT_APP(c) (MB_WM_OBJECT_PARENT_TYPE(c)==MB_WM_TYPE_CLIENT_APP)
 
 /**
  * A MBWMClientBase for applications: that is, those whose type is

Modified: projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-dialog.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-dialog.h	2009-04-30 08:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/matchbox/client-types/mb-wm-client-dialog.h	2009-04-30 10:01:08 UTC (rev 18201)
@@ -30,7 +30,6 @@
 #define MB_WM_CLIENT_DIALOG_CLASS(c) ((MBWMClientDialogClass*)(c))
 #define MB_WM_TYPE_CLIENT_DIALOG (mb_wm_client_dialog_class_type ())
 #define MB_WM_IS_CLIENT_DIALOG(c) (MB_WM_OBJECT_TYPE(c)==MB_WM_TYPE_CLIENT_DIALOG)
-#define MB_WM_PARENT_IS_CLIENT_DIALOG(c) (MB_WM_OBJECT_PARENT_TYPE(c)==MB_WM_TYPE_CLIENT_DIALOG)
 
 /**
  * A MBWMClientBase for dialogue windows: that is, those whose type is

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:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-04-30 10:01:08 UTC (rev 18201)
@@ -276,6 +276,10 @@
   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:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-04-30 10:01:08 UTC (rev 18201)
@@ -124,14 +124,6 @@
 
   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 */

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-object.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-object.h	2009-04-30 08:19:58 UTC (rev 18200)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-object.h	2009-04-30 10:01:08 UTC (rev 18201)
@@ -38,7 +38,6 @@
 #define MB_WM_OBJECT_GET_CLASS(x) (mb_wm_object_get_class (MB_WM_OBJECT(x)))
 #define MB_WM_OBJECT_GET_PARENT_CLASS(x) \
     ((mb_wm_object_get_class (MB_WM_OBJECT(x)))->parent)
-#define MB_WM_OBJECT_PARENT_TYPE(x) (MB_WM_OBJECT_GET_PARENT_CLASS(x)->type)
 
 typedef enum  MBWMObjectClassType
 {


