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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-04 16:53:55 +0300 (Thu, 04 Jun 2009)
New Revision: 18609

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
Log:
patch from Laszlo for NB#120014


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-04 13:45:41 UTC (rev 18608)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-04 13:53:55 UTC (rev 18609)
@@ -1,5 +1,12 @@
 2009-06-04  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
+	Patch from Laszlo for NB#120014.
+
+	* matchbox/core/mb-window-manager.c (mb_wm_focus_client): Mark the
+	client focused even if it was destroyed. The focus will be corrected
+	when the unmap event comes. Also remove unused return value from the
+	function.
+
 	Patch from Laszlo Pere fox NB#117853.
 
 	* matchbox/core/mb-wm-decor.c (mb_wm_decor_button_destroy): Add NULL

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-06-04 13:45:41 UTC (rev 18608)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-06-04 13:53:55 UTC (rev 18609)
@@ -6,6 +6,8 @@
 
   Laszlo:
   * Fixes: NB#117853 - Unreproducible crash -mb_wm_decor_button_destroy ()
+  * Fixes: NB#120014 - Parent window not getting keyboard focus in a mentioned
+    scenario.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon,  1 Jun 2009 08:29:17 +0300
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-04 13:45:41 UTC (rev 18608)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-04 13:53:55 UTC (rev 18609)
@@ -57,7 +57,7 @@
 static void
 mb_wm_process_cmdline (MBWindowManager *wm);
 
-static Bool
+static void
 mb_wm_focus_client (MBWindowManager *wm, MBWindowManagerClient *client);
 
 static Bool
@@ -2004,7 +2004,7 @@
     !mb_wm_client_get_transient_for (c);
 }
 
-static Bool
+static void
 mb_wm_focus_client (MBWindowManager *wm, MBWindowManagerClient *c)
 {
   MBWindowManagerClient *client = c,
@@ -2043,7 +2043,7 @@
        !is_system_modal (client) &&
        wm->focused_client != mb_wm_client_get_transient_for (client))
       )
-    return False;
+    return;
 
   if (!mb_wm_client_is_realized (client))
     {
@@ -2064,10 +2064,15 @@
   if (mb_wm_client_focus (client))
     {
       wm->focused_client = client;
-      return True;
+      return;
     }
 
-  return False;
+  /*
+   * If the window is already destroyed we will get a notification about it
+   * later.
+   */
+  wm->focused_client = client;
+  return;
 }
 
 void