cpw.masca.webkit: bb58b4ce: This looks like a merge error. Fix it.

[masca at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: bb58b4ce9102bfda2512284d6aeb582d8a31315e
Parent:   518b6ca6a1f9c8a25ba8bdaa2125d638527469cd
Author:   masca at cpw.pidgin.im
Date:     09/07/11 00:57:34
Branch:   im.pidgin.cpw.masca.webkit
URL: http://d.pidgin.im/viewmtn/revision/info/bb58b4ce9102bfda2512284d6aeb582d8a31315e

Changelog: 

This looks like a merge error. Fix it.

Changes against parent 518b6ca6a1f9c8a25ba8bdaa2125d638527469cd

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	1a8f267cbed78f386493a615ae0589a141e70990
+++ pidgin/gtkconv.c	63fc353f5f55b986c74306517d2683bfbbdcce5d
@@ -432,8 +432,6 @@ static void clear_conversation_scrollbac
 	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 *con
 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 *
 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 @@ menu_clear_cb(gpointer data, guint actio
 	PurpleConversation *conv;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
-	clear_conversation_scrollback(conv);
+	purple_conversation_clear_message_history(conv);
 }
 
 static void