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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-01 15:01:53 +0300 (Wed, 01 Apr 2009)
New Revision: 17955

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
remove escaping of markup from window titles


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-01 10:54:26 UTC (rev 17954)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-01 12:01:53 UTC (rev 17955)
@@ -1,20 +1,26 @@
+2009-04-01  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-wm-client-window.c
+	(mb_wm_client_window_sync_properties): Remove escaping from
+	WM_NAME and _NET_WM_NAME titles.
+
 2009-04-01  Gordon Williams  <gordon.williams at collabora.co.uk>
 
-        * matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c: Fix for BN#107681.
-          Moved setting and unsetting a pointer to the ClutterClient from
-          HD to inside the ClutterClient
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c: Fix for BN#107681.
+	Moved setting and unsetting a pointer to the ClutterClient from
+	HD to inside the ClutterClient
 
 2009-03-31  Gordon Williams  <gordon.williams at collabora.co.uk>
 
-        * matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c: Fix for NB#107323.
-          It really works this time...
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c: Fix for NB#107323.
+	It really works this time...
 
 2009-03-31  Gordon Williams  <gordon.williams at collabora.co.uk>
 
-        * matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c: Fix for NB#107323,
-          Any actors that were children of the ClutterClient's actor are
-          now removed (this also fixes hd-decor problems that appear to
-          be causing NB#108825)
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c: Fix for NB#107323,
+	Any actors that were children of the ClutterClient's actor are
+	now removed (this also fixes hd-decor problems that appear to
+	be causing NB#108825)
 
 2009-03-31  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-01 10:54:26 UTC (rev 17954)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-01 12:01:53 UTC (rev 17955)
@@ -1,3 +1,9 @@
+matchbox-window-manager-2 (0.2.27-1~unreleased) unstable; urgency=low
+
+  * Remove escaping of markup from window titles.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed,  1 Apr 2009 14:57:29 +0300
+
 matchbox-window-manager-2 (0.2.26-1) unstable; urgency=low
 
   Gordon: 

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-01 10:54:26 UTC (rev 17954)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-04-01 12:01:53 UTC (rev 17955)
@@ -600,14 +600,14 @@
 
       while (*cursor)
 	{
-	  name
-	    = mb_wm_property_get_reply_and_validate (wm,
-						     cookies[*cursor],
-						     *cursor==COOKIE_WIN_NAME? XA_STRING: wm->atoms[MBWM_ATOM_UTF8_STRING],
-						     8,
-						     0,
-						     NULL,
-						     &x_error_code);
+	  name = mb_wm_property_get_reply_and_validate (wm,
+                        cookies[*cursor],
+		        *cursor == COOKIE_WIN_NAME ?
+                                XA_STRING : wm->atoms[MBWM_ATOM_UTF8_STRING],
+		        8,
+		        0,
+		        NULL,
+		        &x_error_code);
 
 	  if (x_error_code == BadWindow)
 	    goto badwindow_error;
@@ -621,28 +621,13 @@
       switch (*cursor)
 	{
 	case COOKIE_WIN_NAME:
-	  /* TODO:  We could convert ISO 8859-1 to UTF-8 here,
-	   * if we thought anyone was likely to use ISO 8859-1
-	   * outside of the range where it coincides with ASCII
-	   * (and therefore also with UTF-8).
-	   */
-
-	  /* We also need to escape the text... */
-	  /* FALLTHROUGH */
-
 	case COOKIE_WIN_NAME_UTF8:
-	  /* We need to escape the text. */
-	  win->name = g_markup_escape_text (name, -1);
-	  break;
-
 	case COOKIE_WIN_NAME_UTF8_XML:
-	  /* Everything's lovely, so just take a copy */
 	  win->name = g_strdup (name);
 	  break;
 
 	case 0:
 	default:
-	  /* didn't find anything */
 	  win->name = g_strdup("unknown");
 	}