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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-10-16 09:01:55 +0300 (Fri, 16 Oct 2009)
New Revision: 19447

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
Log:
releasing


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-10-15 14:52:24 UTC (rev 19446)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-10-16 06:01:55 UTC (rev 19447)
@@ -1,3 +1,13 @@
+2009-10-16  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Release 0.2.73
+
+	* matchbox/core/mb-wm-types.h, matchbox/core/mb-wm-atoms.c: Add
+	_HILDON_WM_WINDOW_TYPE_HOME_APPLET atom.
+	* matchbox/core/mb-window-manager.c (mb_wm_activate_client_real,
+	mb_wm_unfocus_client): Do not automatically assign focus to home
+	applets. Related to NB#140246 - Input method support to desktop
+
 2009-10-14  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Fixes: NB#140193 - Information banners are not shown in non-composite

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-10-15 14:52:24 UTC (rev 19446)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-10-16 06:01:55 UTC (rev 19447)
@@ -1,10 +1,11 @@
-matchbox-window-manager-2 (0.2.73-1~unreleased) unstable; urgency=low
+matchbox-window-manager-2 (0.2.73-1) unstable; urgency=low
 
   Kimmo:
   * Fixes: NB#140193 - Information banners are not shown in non-composite
     mode
+  * Do not automatically assign focus to home applets. Related to NB#140246
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 14 Oct 2009 10:03:07 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 16 Oct 2009 08:59:40 +0300
 
 matchbox-window-manager-2 (0.2.72-1) unstable; urgency=low
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-10-15 14:52:24 UTC (rev 19446)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-10-16 06:01:55 UTC (rev 19447)
@@ -1949,14 +1949,20 @@
     c_focus = last_focused_transient;
   }
 
-  if (c->window->net_type==wm->atoms[MBWM_ATOM_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR]) {
-    g_debug ("Not focusing an animation actor.\n");
-    mb_wm_client_stack (c, 0);
-  } else {
-    mb_wm_focus_client (wm, c_focus);
-    mb_wm_client_stack (c, 0);
-  }
+  if (c->window->net_type ==
+                wm->atoms[MBWM_ATOM_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR] ||
+      c->window->net_type ==
+                wm->atoms[MBWM_ATOM_HILDON_WM_WINDOW_TYPE_HOME_APPLET])
+    {
+      g_debug ("Not focusing an animation actor or home applet.\n");
+    }
+  else
+    {
+      mb_wm_focus_client (wm, c_focus);
+    }
 
+  mb_wm_client_stack (c, 0);
+
   if (is_desktop != was_desktop)
     {
       CARD32 card = is_desktop ? 1 : 0;
@@ -2145,7 +2151,10 @@
 	{
 	  if (c != client &&
 	      mb_wm_client_want_focus (c) &&
-	      mb_wm_client_is_visible (c))
+	      mb_wm_client_is_visible (c) &&
+              /* do not assign focus to Home applets automatically */
+              c->window->net_type !=
+                wm->atoms[MBWM_ATOM_HILDON_WM_WINDOW_TYPE_HOME_APPLET])
 	    {
 	      next = c;
 	      break;

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c	2009-10-15 14:52:24 UTC (rev 19446)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-atoms.c	2009-10-16 06:01:55 UTC (rev 19447)
@@ -104,6 +104,7 @@
     "_HILDON_STACKING_LAYER",
     "_HILDON_WM_NAME",
     "_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR",
+    "_HILDON_WM_WINDOW_TYPE_HOME_APPLET",
     "_HILDON_WM_WINDOW_TYPE",
     "_HILDON_WM_WINDOW_TYPE_LEGACY_MENU",
     "_HILDON_PORTRAIT_MODE_REQUEST",

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h	2009-10-15 14:52:24 UTC (rev 19446)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-types.h	2009-10-16 06:01:55 UTC (rev 19447)
@@ -298,6 +298,7 @@
 
   MBWM_ATOM_HILDON_WM_NAME,
   MBWM_ATOM_HILDON_WM_WINDOW_TYPE_ANIMATION_ACTOR,
+  MBWM_ATOM_HILDON_WM_WINDOW_TYPE_HOME_APPLET,
 
   /* "hildon window type", currently used to tell apart legacy menus from
    * CSMs. */