[Gaim-commits] CVS: gaim/src gtkblist.c,1.174,1.174.2.1

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5355/src

Modified Files:
      Tag: oldstatus
	gtkblist.c 
Log Message:
(21:41:23) datallah: LSchiere:
http://www.butfer.com/gaim-patches/bug_994150.patch fixes bug 994150
(technically MSN chats are really screwy and should be completely
reexamined, but this will stop the crash)
(21:42:05) LSchiere: which branch?
(21:42:07) LSchiere: is that in both?
(21:42:36) datallah: yeah


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.174
retrieving revision 1.174.2.1
diff -u -d -p -r1.174 -r1.174.2.1
--- gtkblist.c	1 Sep 2004 00:46:42 -0000	1.174
+++ gtkblist.c	7 Sep 2004 01:45:04 -0000	1.174.2.1
@@ -665,7 +665,7 @@ static void
 rebuild_joinchat_entries(GaimGtkJoinChatData *data)
 {
 	GaimConnection *gc;
-	GList *list, *tmp;
+	GList *list = NULL, *tmp = NULL;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -683,7 +683,8 @@ rebuild_joinchat_entries(GaimGtkJoinChat
 
 	data->entries = NULL;
 
-	list = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
+	if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info == NULL)
+		list = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
 
 	if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL)
 		defaults = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, NULL);
@@ -2433,13 +2434,14 @@ static char *gaim_get_tooltip_text(GaimB
 		GaimChat *chat = (GaimChat *)node;
 		char *name = NULL;
 		struct proto_chat_entry *pce;
-		GList *parts, *tmp;
+		GList *parts = NULL, *tmp = NULL;
 		GString *parts_text = g_string_new("");
 
 		prpl = gaim_find_prpl(gaim_account_get_protocol_id(chat->account));
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
 
-		parts = prpl_info->chat_info(chat->account->gc);
+		if (prpl_info->chat_info != NULL)
+			parts = prpl_info->chat_info(chat->account->gc);
 
 		name = g_markup_escape_text(gaim_chat_get_name(chat), -1);
 
@@ -4203,7 +4205,7 @@ static void
 rebuild_addchat_entries(GaimGtkAddChatData *data)
 {
 	GaimConnection *gc;
-	GList *list, *tmp;
+	GList *list = NULL, *tmp = NULL;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -4221,7 +4223,8 @@ rebuild_addchat_entries(GaimGtkAddChatDa
 
 	data->entries = NULL;
 
-	list = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
+	if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info != NULL)
+		list = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
 
 	if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL)
 		defaults = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc,
@@ -4311,6 +4314,7 @@ add_chat_select_account_cb(GObject *w, G
 	}
 }
 
+/* XXX this does exactly the same thing as joinchat_account_filter_func() */
 static gboolean
 add_chat_check_account_func(GaimAccount *account)
 {