# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1036312712 0
# Node ID b10f36aa0b1800a8a78b9805abda0b8d0fc58565
# Parent  c246e743ef8be228785c8ae5a1c67650e6c34955
[gaim-migrate @ 4033]
i should stop commiting so often

committer: Tailor Script <tailor@pidgin.im>

diff -r c246e743ef8b -r b10f36aa0b18 Makefile.mingw
--- a/Makefile.mingw	Sun Nov 03 08:35:06 2002 +0000
+++ b/Makefile.mingw	Sun Nov 03 08:38:32 2002 +0000
@@ -62,8 +62,9 @@
 			$(GAIM_PIXMAPS)/gaim_warning.png \
 			$(GAIM_PIXMAPS)/gaim_question.png
 
-PIXMAPS_MENUS =	$(GAIM_PIXMAPS)/insert-image-small.png \
-			$(GAIM_PIXMAPS)/about_menu.png
+PIXMAPS_MENUS =	$(GAIM_PIXMAPS)/about_menu.png \
+			$(GAIM_PIXMAPS)/import_menu.png \
+			$(GAIM_PIXMAPS)/insert-image-small.png
 
 PIXMAPS_BUTTONS =	$(GAIM_PIXMAPS)/edit.png \
 			$(GAIM_PIXMAPS)/accounts.png \
diff -r c246e743ef8b -r b10f36aa0b18 pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Sun Nov 03 08:35:06 2002 +0000
+++ b/pixmaps/Makefile.am	Sun Nov 03 08:38:32 2002 +0000
@@ -33,6 +33,7 @@
 		gnome_preferences.xpm		\
 		gnome_remove.xpm 		\
 		group.xpm			\
+		import-menu.png \
 		insert-image-small.png \
 		insert-link-small.png \
 		insert-smiley-small.png \
diff -r c246e743ef8b -r b10f36aa0b18 pixmaps/import-menu.png
Binary file pixmaps/import-menu.png has changed
diff -r c246e743ef8b -r b10f36aa0b18 src/buddy.c
--- a/src/buddy.c	Sun Nov 03 08:35:06 2002 +0000
+++ b/src/buddy.c	Sun Nov 03 08:38:32 2002 +0000
@@ -2620,7 +2620,7 @@
 
 	gaim_separator(menu);
 
-	gaim_new_item_from_stock(menu, _("Import Buddy List"), GTK_STOCK_EXECUTE,
+	gaim_new_item_from_pixbuf(menu, _("Import Buddy List"), "import-menu.png",
 				  GTK_SIGNAL_FUNC(import_callback), NULL, 0, 0, 0);
 
 	gaim_separator(menu);