[Gaim-commits] SF.net SVN: gaim: [16634] trunk/console/libgnt/gnttextview.c

[<sa...@us...>]

Revision: 16634
Author:   sadrul
Date:     2006-08-04 21:07:52 -0700 (Fri, 04 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16634&view=rev

Log Message:
-----------
Do not waste too much unnecessary memory.

Modified Paths:
--------------
    trunk/console/libgnt/gnttextview.c
Modified: trunk/console/libgnt/gnttextview.c
===================================================================
--- trunk/console/libgnt/gnttextview.c	2006-08-05 03:20:14 UTC (rev 16633)
+++ trunk/console/libgnt/gnttextview.c	2006-08-05 04:07:52 UTC (rev 16634)
@@ -187,7 +187,6 @@
 	for (i = 0; split[i]; i++)
 	{
 		GntTextLine *line;
-		int len = g_utf8_strlen(split[i], -1);
 		char *iter = split[i];
 		int prev = 0;
 
@@ -202,8 +201,9 @@
 		while (iter && *iter)
 		{
 			GntTextSegment *seg = g_new0(GntTextSegment, 1);
+			int len = g_utf8_offset_to_pointer(iter, widget->priv.width - line->length - 1) - iter;
 			seg->flags = fl;
-			seg->text = g_new0(char, len + 1);		/* XXX: MUST be improved */
+			seg->text = g_new0(char, len + 1);
 			g_utf8_strncpy(seg->text, iter, widget->priv.width - line->length - 1);
 			line->segments = g_list_append(line->segments, seg);
 
@@ -215,7 +215,6 @@
 				line = g_new0(GntTextLine, 1);
 				view->list = g_list_prepend(g_list_first(view->list), line);
 			}
-			/*len -= prev;*/
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.