Mercurial > pidgin.yaz

changeset 27212:27ccab320d8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '3eceaa6c40cc71435a27e3175ed313c342e01062' and 'c586c7c63e038d187f56cc31c55b1e09dec584d2'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sat, 20 Jun 2009 21:44:23 +0000
parents bd84462b0e17 (diff) a167106a439a (current diff)
children c952aa75df18
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/finch/plugins/gnthistory.c	Fri Jun 19 18:46:49 2009 +0000
+++ b/finch/plugins/gnthistory.c	Sat Jun 20 21:44:23 2009 +0000
@@ -31,6 +31,7 @@
 #include "util.h"
 #include "version.h"
 
+#include "gntconv.h"
 #include "gntplugin.h"
 #include "gntrequest.h"
 
@@ -54,6 +55,9 @@
 	if (convtype == PURPLE_CONV_TYPE_IM) {
 		GSList *buddies;
 		GSList *cur;
+		FinchConv *fc = FINCH_CONV(c);
+		if (fc->list && fc->list->next) /* We were already in the middle of a conversation. */
+			return;
 
 		/* If we're not logging, don't show anything.
 		 * Otherwise, we might show a very old log. */