# HG changeset patch # User Ethan Blanton # Date 1166661621 0 # Node ID ebe19ec7c78c5749efe8f334d9fe37806ed50e0b # Parent 859250fbf8a58f1ae5c5eca87b8706fa6bf40aff [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 diff -r 859250fbf8a5 -r ebe19ec7c78c COPYRIGHT --- 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 diff -r 859250fbf8a5 -r ebe19ec7c78c gtk/gtkblist.c --- 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)