# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1133024969 0
# Node ID 18f0dadb29cfb993379480a05533c672ddf5a83e
# Parent  f28e51bf9be8517ba368a18555bcd5dee5a79887
[gaim-migrate @ 14531]
SF Patch #1366481 from Michael Carlson

"The function gtk_smiley_tree_insert() in gtkimhtml.c is
 using up (on my system) the most CPU of all the
 functions in gaim whenever the preferences box is
 opened (tested by opening the preferences box 50 times
 and measuring with oprofile).

 The function is called some 297 times each time the
 prefs box is opened, and each time we call strlen() on
 a (usually 3 or 4) character string to see if the
 string is empty or not.

 I've eliminated the unnecessary call to strlen by
 checking the first element, and I've changed the while
 {} loop to a do {} while loop, because since we return
 if the string is empty at the beginning of the
 function, the same check on the first iteration of the
 loop is unnecessary.

 I believe it's faster for every case, even if only by a
 little bit."

I don't know how necessary this is, but it doesn't hurt and it doesn't negatively impact the readability of the code.

I also fixed an existing piece of code for which the compiler issued a warning.

committer: Tailor Script <tailor@pidgin.im>

diff -r f28e51bf9be8 -r 18f0dadb29cf src/gtkimhtml.c
--- a/src/gtkimhtml.c	Sat Nov 26 16:27:45 2005 +0000
+++ b/src/gtkimhtml.c	Sat Nov 26 17:09:29 2005 +0000
@@ -334,10 +334,10 @@
 	GtkSmileyTree *t = tree;
 	const gchar *x = smiley->smile;
 
-	if (!strlen (x))
+	if (!(*x))
 		return;
 
-	while (*x) {
+	do {
 		gchar *pos;
 		gint index;
 
@@ -356,7 +356,7 @@
 		t = t->children [index];
 
 		x++;
-	}
+	} while (*x);
 
 	t->image = smiley;
 }
@@ -369,7 +369,7 @@
 
 	while (list) {
 		GtkSmileyTree *t = list->data;
-		gint i;
+		gsize i;
 		list = g_slist_remove(list, t);
 		if (t && t->values) {
 			for (i = 0; i < t->values->len; i++)