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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-17 10:41:23 +0300 (Fri, 17 Apr 2009)
New Revision: 18092

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h
Log:
Added name_has_markup member to struct MBWMClientWindow.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-17 06:31:24 UTC (rev 18091)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-17 07:41:23 UTC (rev 18092)
@@ -1,3 +1,11 @@
+2009-04-17  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-wm-client-window.h: Add name_has_markup member to
+	struct MBWMClientWindow.
+	* matchbox/core/mb-wm-client-window.c
+	(mb_wm_client_window_sync_properties): Set name_has_markup member when
+	reading the window title. Related to fix for NB#108303
+
 2009-04-16  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	* matchbox/core/mb-wm-decor.c (mb_wm_decor_press_handler): Remove the

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-17 06:31:24 UTC (rev 18091)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-17 07:41:23 UTC (rev 18092)
@@ -2,6 +2,7 @@
 
   * Fixes: NB#110052 - Tapping on [X] icon does not always succeed in closing
     applications
+  * Added name_has_markup member to struct MBWMClientWindow.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 16 Apr 2009 18:55:46 +0300
 

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-17 06:31:24 UTC (rev 18091)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-04-17 07:41:23 UTC (rev 18092)
@@ -614,13 +614,19 @@
 	{
 	case COOKIE_WIN_NAME:
 	case COOKIE_WIN_NAME_UTF8:
+	  win->name = g_strdup (name);
+	  win->name_has_markup = False;
+          break;
+
 	case COOKIE_WIN_NAME_UTF8_XML:
 	  win->name = g_strdup (name);
+	  win->name_has_markup = True;
 	  break;
 
 	case 0:
 	default:
 	  win->name = g_strdup("unknown");
+	  win->name_has_markup = False;
 	}
 
       /* FIXME: We could also check the UTF-8 for validity here. */

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h	2009-04-17 06:31:24 UTC (rev 18091)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.h	2009-04-17 07:41:23 UTC (rev 18092)
@@ -124,6 +124,7 @@
   MBGeometry                     x_geometry;
   unsigned int                   depth;
   char                          *name;
+  Bool                           name_has_markup;
   Window                         xwindow;
   Visual                        *visual;
   Colormap                       colormap;