pidgin: 64263ae2: For chats created using the "normal" (i....

datallah at pidgin.im datallah at pidgin.im
Mon May 12 22:40:39 EDT 2008


-----------------------------------------------------------------
Revision: 64263ae223a317116a83aab2c6a2a36b4c308d7b
Ancestor: 364fe196da88a96016eef029b30bc4161d019e01
Author: datallah at pidgin.im
Date: 2008-05-13T02:34:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/64263ae223a317116a83aab2c6a2a36b4c308d7b

Modified files:
        libpurple/blist.c

ChangeLog: 

For chats created using the "normal" (i.e. Join a Chat) flow, there will always
be prpl_info->chat_info, but for stuff like the MSN conferences, there will not
necessarily be. Eion Robb noticed this issue. Fixes #5777.
-------------------------------------------------------------------------------

-------------- next part --------------
============================================================
--- libpurple/blist.c	0b556c797ea883ca59a0c070b6e95b388cd9ee19
+++ libpurple/blist.c	f57e84e7cd1357648af932e0f57fb9d1bd919698
@@ -2073,9 +2073,7 @@ const char *purple_chat_get_name(PurpleC
 
 const char *purple_chat_get_name(PurpleChat *chat)
 {
-	struct proto_chat_entry *pce;
-	GList *parts;
-	char *ret;
+	char *ret = NULL;
 	PurplePlugin *prpl;
 	PurplePluginProtocolInfo *prpl_info = NULL;
 
@@ -2087,11 +2085,14 @@ const char *purple_chat_get_name(PurpleC
 	prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account));
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 
-	parts = prpl_info->chat_info(purple_account_get_connection(chat->account));
-	pce = parts->data;
-	ret = g_hash_table_lookup(chat->components, pce->identifier);
-	g_list_foreach(parts, (GFunc)g_free, NULL);
-	g_list_free(parts);
+	if (prpl_info->chat_info) {
+		struct proto_chat_entry *pce;
+		GList *parts = prpl_info->chat_info(purple_account_get_connection(chat->account));
+		pce = parts->data;
+		ret = g_hash_table_lookup(chat->components, pce->identifier);
+		g_list_foreach(parts, (GFunc)g_free, NULL);
+		g_list_free(parts);
+	}
 
 	return ret;
 }


More information about the Commits mailing list