# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1196853119 0
# Node ID 3fdd39411e3e659125da709cbd13b09ff3e5a35f
# Parent  3b1d7caddc27ef0cb2c5bcf6c1b424bc4f93c3ee# Parent  2a47eefca6b3325264c5630cc741cd6029ea4f94
merge of '7e3fbc31d04d03b44eec338a8703cd9329136a9a'
     and 'cc1c6037df9dd3887248c7bf7627ee45663949ff'

diff -r 3b1d7caddc27 -r 3fdd39411e3e pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Wed Dec 05 07:34:11 2007 +0000
+++ b/pidgin/gtkimhtml.c	Wed Dec 05 11:11:59 2007 +0000
@@ -838,28 +838,6 @@
 	gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, 5);
 
 	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(clear_formatting_cb), imhtml);
-	
-	mi = gtk_menu_item_new();
-	gtk_widget_show(mi);
-	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), mi);
-
-	img = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY, GTK_ICON_SIZE_MENU);
-	mi = gtk_image_menu_item_new_with_mnemonic(_("S_mile!"));
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
-	gtk_widget_show(mi);
-	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), mi);
-
-	img = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_INSERT, GTK_ICON_SIZE_MENU);
-	mi = gtk_image_menu_item_new_with_mnemonic(_("_Insert"));
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
-	gtk_widget_show(mi);
-	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), mi);
-
-	img = gtk_image_new_from_stock(GTK_STOCK_BOLD, GTK_ICON_SIZE_MENU);
-	mi = gtk_image_menu_item_new_with_mnemonic(_("_Font"));
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
-	gtk_widget_show(mi);
-	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), mi);
 }
 
 static char *