merge of '8639bba9bf2d89b63069306a793c311d6c2990f8'

Thu, 30 Aug 2007 03:18:12 +0000

author
William Ehlhardt <williamehlhardt@gmail.com>
date
Thu, 30 Aug 2007 03:18:12 +0000
changeset 19702
881abb160b70
parent 19699
8639bba9bf2d (current diff)
parent 19701
d5c5982757d5 (diff)
child 19703
fe6fb15211af

merge of '8639bba9bf2d89b63069306a793c311d6c2990f8'
and 'd5c5982757d5833ebb8ab7dd5495a59b20271db8'


committer: Daniel Atallah <datallah@pidgin.im>

--- a/pidgin/gtkblist.c	Thu Aug 30 00:09:47 2007 +0000
+++ b/pidgin/gtkblist.c	Thu Aug 30 03:18:12 2007 +0000
@@ -125,7 +125,7 @@
 static PidginBuddyList *gtkblist = NULL;
 
 static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list);
-static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean statusChange);
+static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change);
 static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data);
 static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node);
 static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBlistNode *node);
@@ -614,6 +614,8 @@
 static void
 pidgin_blist_update_privacy_cb(PurpleBuddy *buddy)
 {
+	if (buddy->node.ui_data == NULL || ((struct _pidgin_blist_node*)buddy->node.ui_data)->row == NULL)
+		return;
 	pidgin_blist_update_buddy(purple_get_blist(), (PurpleBlistNode*)(buddy), TRUE);
 }
 
@@ -5158,7 +5160,7 @@
 
 
 
-static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean statusChange)
+static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change)
 {
 	PurpleBuddy *buddy;
 	struct _pidgin_blist_node *gtkparentnode;

mercurial