im.pidgin.pidgin: e68a819d41fa330b4829782ee726cbe3d0dfa013

datallah at pidgin.im datallah at pidgin.im
Mon Dec 3 16:31:00 EST 2007


-----------------------------------------------------------------
Revision: e68a819d41fa330b4829782ee726cbe3d0dfa013
Ancestor: 3fe65eb2edfee15615ff166f23974cfe540d6b66
Author: datallah at pidgin.im
Date: 2007-12-03T21:26:54
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

Fix #4229 by not crashing when there is an invalid group name. There is probably a bug elsewhere that causes this (I'm guessing with the ICQ encoding or something.)

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	aa78d6e945145330e8eaafa97971858ab4ff0327
+++ pidgin/gtkblist.c	9fe8e46b3e3a5c446eacebea49684a80314b2c21
@@ -5715,11 +5715,11 @@ static char *pidgin_get_group_title(Purp
 
 	esc = g_markup_escape_text(group->name, -1);
 	if (selected)
-		mark = g_strdup_printf("<span weight='bold'>%s</span>%s", esc, group_count);
+		mark = g_strdup_printf("<span weight='bold'>%s</span>%s", esc ? esc : "", group_count);
 	else
 		mark = g_strdup_printf("<span color='#%02x%02x%02x' weight='bold'>%s</span>%s",
 				       textcolor.red>>8, textcolor.green>>8, textcolor.blue>>8,
-				       esc, group_count);
+				       esc ? esc : "", group_count);
 
 	g_free(esc);
 	return mark;


More information about the Commits mailing list