merge of '6de6b77176ac32d21dc8eee0f6510576120a851d'

Wed, 05 Dec 2007 11:11:59 +0000

author
Evan Schoenberg <evands@pidgin.im>
date
Wed, 05 Dec 2007 11:11:59 +0000
changeset 21898
289c135b4d16
parent 21897
6de6b77176ac (current diff)
parent 21896
bf8338f9b833 (diff)
child 21899
f8cbf5a31abe

merge of '6de6b77176ac32d21dc8eee0f6510576120a851d'
and 'bf8338f9b833d89c2ac91ff8386ca4e11ca70bd9'

--- 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 *

mercurial