Mercurial > pidgin.yaz

changeset 9959:b6a74cbfd182

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10866] and in the other tree committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 07 Sep 2004 01:46:02 +0000
parents de25b23933fa
children faf9ccf3e0d5
files src/gtkblist.c
diffstat 1 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkblist.c	Tue Sep 07 01:40:50 2004 +0000
+++ b/src/gtkblist.c	Tue Sep 07 01:46:02 2004 +0000
@@ -667,7 +667,7 @@
 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;
@@ -685,7 +685,8 @@
 
 	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);
@@ -2437,13 +2438,14 @@
 		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);
 
@@ -4269,7 +4271,7 @@
 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;
@@ -4287,7 +4289,8 @@
 
 	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,
@@ -4377,6 +4380,7 @@
 	}
 }
 
+/* XXX this does exactly the same thing as joinchat_account_filter_func() */
 static gboolean
 add_chat_check_account_func(GaimAccount *account)
 {