diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2007-12-03 22:37:26 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2007-12-03 22:37:26 +0000 |
| commit | 4a5513e17e3531e394ccbde4cdb71a97a383c3ea (patch) | |
| tree | 51fa13b1ec8c848599009ef660c95ecb413c78af | |
| parent | 3ac06830c2f21fb7399f7cfd89273e45d972e439 (diff) | |
| download | pidgin-4a5513e17e3531e394ccbde4cdb71a97a383c3ea.tar.gz | |
applied changes from e68a819d41fa330b4829782ee726cbe3d0dfa013
through c93ff822e1d2ed0916468029ebfbbea0ed0f28fa
applied changes from 3fe65eb2edfee15615ff166f23974cfe540d6b66
through e68a819d41fa330b4829782ee726cbe3d0dfa013
| -rw-r--r-- | pidgin/gtkblist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c index 6fd69a3d5b..b6c89f5c2e 100644 --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -1384,7 +1384,7 @@ pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub) 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(PurpleBlistNode *gnode, gboolean expanded) 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; |