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

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-03-22 05:49:27 +0200 (Sun, 22 Mar 2009)
New Revision: 17769

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
        Refs NB#96260.
	* matchbox/core/mb-wm-client-window.c: newlines in window titles
	are converted to spaces.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-20 19:36:59 UTC (rev 17768)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-22 03:49:27 UTC (rev 17769)
@@ -1,3 +1,10 @@
+2009-03-21  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+        Refs NB#96260.
+	
+	* matchbox/core/mb-wm-client-window.c: newlines in window titles
+	are converted to spaces.
+
 2009-03-20  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	* matchbox/core/mb-wm-decor.c (mb_wm_decor_button_press_handler): Fix

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-03-20 19:36:59 UTC (rev 17768)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-03-22 03:49:27 UTC (rev 17769)
@@ -665,6 +665,15 @@
 
       /* FIXME: We could also check the UTF-8 for validity here. */
 
+      /* If they put newlines in, it will look stupid, so
+	 take them out. */
+      {
+	char *newline;
+
+	while (newline = index (win->name, '\n'))
+	  *newline = ' ';
+      }
+
       MBWM_DBG("@@@ New Window Name: '%s' @@@", win->name);
 
       XFree (name);