# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1190172640 0
# Node ID 16f887f250443abf2c1a738b58d211dd4495d81c
# Parent  a112d292be7f0f1117ef8da2e54fe390a9440e88# Parent  426e854b25ffbf22b4b8ed3be48314fd4c73bc4b
merge of '097e3112bf004e39eaa28cdcea236c7bfddbbdf4'
     and '9d666a05f9569be17a93e24e246036b18126007a'

diff -r 426e854b25ff -r 16f887f25044 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Sep 19 02:39:00 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Sep 19 03:30:40 2007 +0000
@@ -376,10 +376,13 @@
 static void clear_conversation_scrollback(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = NULL;
+	GList *iter;
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtk_imhtml_clear(GTK_IMHTML(gtkconv->imhtml));
+	for (iter = gtkconv->convs; iter; iter = iter->next)
+		purple_conversation_clear_message_history(iter->data);
 }
 
 static PurpleCmdRet
@@ -387,7 +390,6 @@
                  const char *cmd, char **args, char **error, void *data)
 {
 	clear_conversation_scrollback(conv);
-	purple_conversation_clear_message_history(conv);
 	return PURPLE_CMD_STATUS_OK;
 }
 
@@ -1099,12 +1101,9 @@
 {
 	PidginWindow *win = data;
 	PurpleConversation *conv;
-	PidginConversation *gtkconv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
-	gtkconv = PIDGIN_CONVERSATION(conv);
-
-	gtk_imhtml_clear(GTK_IMHTML(gtkconv->imhtml));
+	clear_conversation_scrollback(conv);
 }
 
 struct _search {