changeset 15244:ebe19ec7c78c

[gaim-migrate @ 18034] This patch fixes startup crashes when the blist is manipulated before the Gtk blist is created. Thanks to Geoffrey Antos. committer: Tailor Script <tailor@pidgin.im>
author Ethan Blanton <elb@pidgin.im>
date Thu, 21 Dec 2006 00:40:21 +0000
parents 859250fbf8a5
children d5e7690a9b06
files COPYRIGHT gtk/gtkblist.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Wed Dec 20 20:38:20 2006 +0000
+++ b/COPYRIGHT	Thu Dec 21 00:40:21 2006 +0000
@@ -7,6 +7,7 @@
 Dave Ahlswede
 Manuel Amador
 Matt Amato
+Geoffrey Antos
 Daniel Atallah
 Paul Aurich
 Patrick Aussems
--- a/gtk/gtkblist.c	Wed Dec 20 20:38:20 2006 +0000
+++ b/gtk/gtkblist.c	Thu Dec 21 00:40:21 2006 +0000
@@ -4371,6 +4371,10 @@
 
 static void redo_buddy_list(GaimBuddyList *list, gboolean remove, gboolean rerender)
 {
+	gtkblist = GAIM_GTK_BLIST(list);
+	if(!gtkblist || !gtkblist->treeview)
+		return;
+
 	GaimBlistNode *node = list->root;
 
 	while (node)
@@ -4863,7 +4867,7 @@
 {
 	if (list)
 		gtkblist = GAIM_GTK_BLIST(list);
-	if(!gtkblist || !node)
+	if(!gtkblist || !gtkblist->treeview || !node)
 		return;
 
 	if (node->ui_data == NULL)