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

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-07-03 02:43:20 +0300 (Fri, 03 Jul 2009)
New Revision: 18831

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
Log:
	* matchbox/core/mb-wm-client-base.c: Add check that a window is
	not an animation actor immediately before we focus it; extends
	fix for NB#120885.  Possibly fixes NB#123909.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-02 12:07:10 UTC (rev 18830)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-02 23:43:20 UTC (rev 18831)
@@ -1,3 +1,9 @@
+2009-07-02  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+	* matchbox/core/mb-wm-client-base.c: Add check that a window is
+	not an animation actor immediately before we focus it; extends
+	fix for NB#120885.  Possibly fixes NB#123909.
+
 2009-06-29  Aapo Kojo <aapo.kojo at nokia.com>
 
 	Release 0.2.45

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-07-02 12:07:10 UTC (rev 18830)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-base.c	2009-07-02 23:43:20 UTC (rev 18831)
@@ -826,6 +826,13 @@
   if (xwin == last_focused)
     return False;
 
+  if (client->window->net_type==
+      wm->atoms[MBWM_ATOM_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR])
+    {
+      g_debug ("Not focusing an animation actor.\n");
+      return False;
+    }
+
   if (client->window->protos & MBWMClientWindowProtosFocus)
     {
       MBWM_NOTE (CLIENT, "sending XEvent WM_TAKE_FOCUS to %x", xwin);