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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-04 09:16:59 +0300 (Thu, 04 Jun 2009)
New Revision: 18604

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
revert Thomas' 512 limit


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-04 02:02:33 UTC (rev 18603)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-04 06:16:59 UTC (rev 18604)
@@ -1,3 +1,8 @@
+2009-06-04  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Revert Thomas' fix for NB#114352, since there should be already 1024
+	byte limit (better fix that if it's broken), needs more investigation.
+
 2009-06-03  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	* matchbox/core/mb-wm-client.[ch]: add new function
@@ -4,13 +9,9 @@
 	mb_wm_client_get_next_focused_app() to return the app next above
 	a given client in the focus order.
 
-2009-06-03  Thomas Thurman  <thomas.thurman at collabora.co.uk>
-
 	* matchbox/theme-engines/mb-wm-theme-png.c: avoid warning about
 	unused result of fread().
 
-2009-06-03  Thomas Thurman  <thomas.thurman at collabora.co.uk>
-
 	Fixes: NB#114352 Unwanted line is displayed in contact starter view
 
 	* matchbox/core/mb-wm-client-window.c: Truncate window titles

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-06-04 02:02:33 UTC (rev 18603)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-06-04 06:16:59 UTC (rev 18604)
@@ -612,32 +612,8 @@
 	    goto badwindow_error;
 
 	  if (name)
-	    {
-	      const int maximum_name_length = 512;
-	      if (strlen(name) > maximum_name_length)
-		{
-		  /* Bug 114352: stupidly long names get truncated. */
-		  g_warning ("Window name was too long; truncating it.\n");
-		  name[maximum_name_length] = 0;
+	    break;
 
-		  /* We run the risk of making the XML invalid,
-		   * which will cause no title at all to be shown,
-		   * so just pretend it's ordinary UTF-8 text.
-		   */
-		  if (*cursor==COOKIE_WIN_NAME_UTF8_XML)
-		    *cursor = COOKIE_WIN_NAME_UTF8;
-
-		  /*
-		   * (We also run the risk of making the UTF-8 invalid
-		   * by cutting a character in the middle, but since
-		   * this only causes a warning to be displayed and
-		   * doesn't stop the rest of the string being shown,
-		   * we don't need to deal with it.)
-		   */
-		}
-	      break;
-	    }
-
 	  cursor++;
 	}