Mercurial > pidgin.yaz

changeset 6496:e0c80bec996a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7011] gru. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 18 Aug 2003 21:16:31 +0000
parents 8ce66049ce68
children af1a50d49f03
files src/conversation.c
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/conversation.c	Mon Aug 18 21:01:03 2003 +0000
+++ b/src/conversation.c	Mon Aug 18 21:16:31 2003 +0000
@@ -1431,7 +1431,7 @@
 						time_t mtime)
 {
 	GaimPluginProtocolInfo *prpl_info = NULL;
-	GaimConnection *gc;
+	GaimConnection *gc = NULL;
 	GaimAccount *account;
 	GaimConversationUiOps *ops;
 	GaimWindow *win;
@@ -1448,18 +1448,20 @@
 		return;
 
 	account = gaim_conversation_get_account(conv);
-	gc      = gaim_account_get_connection(account);
+
+	if (account != NULL)
+		gc = gaim_account_get_connection(account);
 
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
-		(account->gc == NULL || !g_slist_find(account->gc->buddy_chats, conv)))
+		(gc == NULL || !g_slist_find(gc->buddy_chats, conv)))
 		return;
 
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
 		!g_list_find(gaim_get_conversations(), conv))
 		return;
 
-	if (account->gc != NULL) {
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
+	if (gc != NULL) {
+		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
 		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM ||
 			!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {