Mercurial > pidgin.yaz

diff src/util.c @ 4635:42d53c416bb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4942] remove deprecated gtk calls, gtk2-ify log viewer, gtk2-ify jabber vcard dialog, and probably a cleanup or two I forgot about. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sun, 02 Mar 2003 19:21:36 +0000
parents 3196d9044a45
children 4938d12f6d48
line wrap: on
line diff
--- a/src/util.c	Sun Mar 02 18:48:02 2003 +0000
+++ b/src/util.c	Sun Mar 02 19:21:36 2003 +0000
@@ -1126,11 +1126,11 @@
 
 	if (icon == NULL)
 		menuitem = gtk_menu_item_new_with_mnemonic(str);
-	else 
+	else
 		menuitem = gtk_image_menu_item_new_with_mnemonic(str);
 
 	if (menu)
-		gtk_menu_append(GTK_MENU(menu), menuitem);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
 	if (sf)
 		g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
@@ -1173,7 +1173,7 @@
 		menuitem = gtk_image_menu_item_new_with_mnemonic(_(str));
 
 	if (menu)
-		gtk_menu_append(GTK_MENU(menu), menuitem);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
 	if (sf)
 		g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
@@ -1218,7 +1218,7 @@
 
 	menuitem = gtk_menu_item_new();
 	if (menu)
-		gtk_menu_append(GTK_MENU(menu), menuitem);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	if (sf)
 		/* passing 1 is necessary so if we sign off closing the account editor doesn't exit */
 		g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
@@ -1232,7 +1232,7 @@
 	/* Create our pixmap and pack it */
 	gtk_widget_realize(menu->parent);
 	pm = gdk_pixmap_create_from_xpm_d(menu->parent->window, &mask, NULL, xpm);
-	pixmap = gtk_pixmap_new(pm, mask);
+	pixmap = gtk_image_new_from_pixmap(pm, mask);
 	gtk_widget_show(pixmap);
 	gdk_pixmap_unref(pm);
 	gdk_bitmap_unref(mask);
@@ -1264,7 +1264,7 @@
 
 	menuitem = gtk_menu_item_new();
 	if (menu)
-		gtk_menu_append(GTK_MENU(menu), menuitem);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	gtk_widget_show(menuitem);
 
 	label = gtk_label_new(str);