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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-11 09:41:30 +0300 (Thu, 11 Jun 2009)
New Revision: 18699

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
Log:
reverting Thomas' fix in hope for a more complete one


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-10 23:03:47 UTC (rev 18698)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-11 06:41:30 UTC (rev 18699)
@@ -1,22 +1,3 @@
-2009-06-10  Thomas Thurman  <thomas.thurman at collabora.co.uk>
-
-	* matchbox/core/mb-window-manager.c: remove debugging code.
-
-2009-06-10  Thomas Thurman  <thomas.thurman at collabora.co.uk>
-
-	* matchbox/core/mb-window-manager.c: Amendment to previous
-	fix.  Let's focus windows if they are apps or dialogues
-	or menus, rather than just if they are able to take the
-	focus.
-
-2009-06-09  Thomas Thurman  <thomas.thurman at collabora.co.uk>
-
-	NB#118850
-	
-	* matchbox/core/mb-window-manager.c: When a window loses the
-	focus, and we look for a window to focus instead, don't
-	attempt to focus any window which can't take the focus!
-
 2009-06-08  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.42

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-10 23:03:47 UTC (rev 18698)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-06-11 06:41:30 UTC (rev 18699)
@@ -2103,30 +2103,10 @@
 
   wm->focused_client = NULL;
 
-  /* If a window can't be focussed, don't attempt to focus it.
-   * Instead, just skip over it and try the next one.
-   * (NB#118850.)
-   */
-
-  while (next && !(MB_WM_IS_CLIENT_APP (next) ||
-		   MB_WM_PARENT_IS_CLIENT_APP (next) ||
-		   MB_WM_IS_CLIENT_MENU (next) ||
-		   MB_WM_IS_CLIENT_DIALOG (next) ||
-		   MB_WM_PARENT_IS_CLIENT_DIALOG (next)))
-    {
-      g_debug ("Skipping %x because it's not focusable\n",
-	       next->window->xwindow);
-
-      next = next->stacked_below;    
-    }
-
   if (next)
     {
-      g_debug ("Focussing %x", next->window->xwindow);
       mb_wm_focus_client (wm, next);
     }
-  else
-    g_debug ("Ran out of windows to focus.\n");
 }
 
 void