im.pidgin.pidgin.2.3.1: 3b4fb639f165b988050eb7353c04c3cad78d9fe8

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 3b4fb639f165b988050eb7353c04c3cad78d9fe8
Ancestor: 3981a5267ddb3bd42a35efebaf213d3af32bdb65
Author: datallah at pidgin.im
Date: 2007-12-03T22:37:26
Branch: im.pidgin.pidgin.2.3.1

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

applied changes from e68a819d41fa330b4829782ee726cbe3d0dfa013
             through c93ff822e1d2ed0916468029ebfbbea0ed0f28fa

applied changes from 3fe65eb2edfee15615ff166f23974cfe540d6b66
             through e68a819d41fa330b4829782ee726cbe3d0dfa013

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	0d95759db5ab57cf7381c8cc32bf41e66fdba224
+++ pidgin/gtkblist.c	966617642f39748e76642945f9aeeabc489e4891
@@ -1384,7 +1384,7 @@ pidgin_blist_make_buddy_menu(GtkWidget *
 	pidgin_append_blist_node_proto_menu(menu, buddy->account->gc, node);
 	pidgin_append_blist_node_extended_menu(menu, node);
 
-	if (!contact_expanded)
+	if (!contact_expanded && contact != NULL)
 		pidgin_append_blist_node_move_to_menu(menu, (PurpleBlistNode *)contact);
 
 	if (node->parent && node->parent->child->next && 
@@ -5719,11 +5719,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;