# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1181185821 0
# Node ID 0c70c55506cf409d1954d44e70cc67941099f28f
# Parent  891f22c7e884f36c01e255f9be50e7b6162d82f9
Remove duplicate code from a bad merge.

diff -r 891f22c7e884 -r 0c70c55506cf pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Wed Jun 06 16:00:27 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Thu Jun 07 03:10:21 2007 +0000
@@ -1238,19 +1238,3 @@
 	g_free(toolbar->sml);
 	toolbar->sml = g_strdup(proto_id);
 }
-	g_signal_connect(G_OBJECT(imhtml), "format_function_update", G_CALLBACK(update_format_cb), toolbar);
-	g_signal_connect_after(G_OBJECT(GTK_IMHTML(imhtml)->text_buffer), "mark-set", G_CALLBACK(mark_set_cb), toolbar);
-
-	buttons = gtk_imhtml_get_format_functions(GTK_IMHTML(imhtml));
-	update_buttons_cb(GTK_IMHTML(imhtml), buttons, toolbar);
-
-	gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), &bold, &italic, &underline);
-
-	update_buttons(toolbar);
-}
-
-void gtk_imhtmltoolbar_associate_smileys(GtkIMHtmlToolbar *toolbar, const char *proto_id)
-{
-	g_free(toolbar->sml);
-	toolbar->sml = g_strdup(proto_id);
-}