Mercurial > pidgin.yaz

changeset 32590:0e94b0815349

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This looks like a merge error. Fix it.
author masca@cpw.pidgin.im
date Wed, 07 Sep 2011 04:57:34 +0000
parents d273b747de14
children 91d098444b91
files pidgin/gtkconv.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Wed Sep 07 04:35:38 2011 +0000
+++ b/pidgin/gtkconv.c	Wed Sep 07 04:57:34 2011 +0000
@@ -432,8 +432,6 @@
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (gtkconv->webview), "", "");
-	for (iter = gtkconv->convs; iter; iter = iter->next)
-		purple_conversation_clear_message_history(iter->data);
 }
 
 
@@ -447,7 +445,7 @@
 clear_command_cb(PurpleConversation *conv,
                  const char *cmd, char **args, char **error, void *data)
 {
-	clear_conversation_scrollback(conv);
+	purple_conversation_clear_message_history(conv);
 	return PURPLE_CMD_RET_OK;
 }
 
@@ -455,7 +453,7 @@
 clearall_command_cb(PurpleConversation *conv,
                  const char *cmd, char **args, char **error, void *data)
 {
-	purple_conversation_foreach(clear_conversation_scrollback);
+	purple_conversation_foreach(purple_conversation_clear_message_history);
 	return PURPLE_CMD_RET_OK;
 }
 
@@ -1148,7 +1146,7 @@
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
-	clear_conversation_scrollback(conv);
+	purple_conversation_clear_message_history(conv);
 }
 
 static void