changeset 718:c2e3e4e59a17

[gaim-migrate @ 728] Working on stuff. committer: Tailor Script <[e-mail]>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/import_small.xpm	Fri Aug 18 06:11:56 2000 +0000
@@ -0,0 +1,81 @@
+/* XPM */
+static char * import_small_xpm[] = {
+"18 18 60 1",
+" 	c None",
+".	c #000000",
+"+	c #252420",
+"@	c #0E0D0C",
+"#	c #383730",
+"$	c #2D2C26",
+"%	c #43413A",
+"&	c #545148",
+"*	c #615D53",
+"=	c #5A574D",
+"-	c #2A2924",
+";	c #C3C0A7",
+">	c #B4B19A",
+",	c #A8A590",
+"'	c #605E52",
+")	c #5B5851",
+"!	c #55524C",
+"~	c #6F6D5D",
+"{	c #615E53",
+"]	c #6F6C5F",
+"^	c #A7A690",
+"/	c #DAD6BA",
+"(	c #C1BEA6",
+"_	c #8F8D79",
+":	c #5D5D58",
+"<	c #1A1A18",
+"[	c #6A6660",
+"}	c #D4CCC0",
+"|	c #A9A398",
+"1	c #777469",
+"2	c #4B4941",
+"3	c #878575",
+"4	c #8F8E7C",
+"5	c #6F6E65",
+"6	c #76766F",
+"7	c #84847C",
+"8	c #21211F",
+"9	c #CEC6BA",
+"0	c #A6A095",
+"a	c #32322E",
+"b	c #787871",
+"c	c #82827A",
+"d	c #5B5852",
+"e	c #C3BBB0",
+"f	c #7E7E76",
+"g	c #1E1E1C",
+"h	c #1E1D1B",
+"i	c #2C2B28",
+"j	c #BCB6A9",
+"k	c #7C7C75",
+"l	c #40403D",
+"m	c #070706",
+"n	c #1D1D1A",
+"o	c #757269",
+"p	c #B5AEA3",
+"q	c #1E1E1D",
+"r	c #6E6E68",
+"s	c #4B4B47",
+"t	c #3C3B36",
+"u	c #0B0B0B",
+"                  ",
+"                  ",
+"        ..        ",
+"        ...       ",
+"        ...       ",
+"        ...       ",
+"       .....      ",
+"      .+@.#$.     ",
+"    .%&*=-;>,'.   ",
+"    )!~{]^/(_:<   ",
+"    [}|12345678   ",
+"    [}}90abc778   ",
+"    [}}}}877778   ",
+"    de}}}8777fg   ",
+"    hij}}877klm   ",
+"      nopqrs.     ",
+"       .tug.      ",
+"                  "};

--- a/src/buddy.c	Fri Aug 18 04:37:44 2000 +0000
+++ b/src/buddy.c	Fri Aug 18 06:11:56 2000 +0000
@@ -66,6 +66,7 @@
 #include "pixmaps/daemon-permdel.xpm"
 
 #include "pixmaps/add_small.xpm"
+#include "pixmaps/import_small.xpm"
 
 static GtkTooltips *tips;
 static GtkWidget *editpane;
@@ -1723,13 +1724,7 @@
 	gtk_widget_show(menuitem);
 
 	/* Create our container */
-	hbox = gtk_hbox_new(FALSE, 5);
-
-	/* Create our label and pack it */
-	label = gtk_label_new(str);
-	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-
+	hbox = gtk_hbox_new(FALSE, 2);
 
 	/* Create our pixmap and pack it */
 	pm = gdk_pixmap_create_from_xpm_d(menu->parent->window, &mask, NULL, xpm);
@@ -1737,9 +1732,14 @@
 	pixmap = gtk_pixmap_new(pm, mask);
 	gtk_widget_show(pixmap);
 
-	gtk_box_pack_end(GTK_BOX(hbox), pixmap, FALSE, FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 2);
+
+	/* Create our label and pack it */
 
-	
+	label = gtk_label_new(str);
+	gtk_widget_show(label);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+
 	/* And finally, pack our box within our menu item */
 
 	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
@@ -1844,22 +1844,22 @@
 
 	// gaim_new_item(menu, _("Add A Buddy"), GTK_SIGNAL_FUNC(add_buddy_callback));
 	gaim_new_item_with_pixmap(menu, _("Add A Buddy"), add_small_xpm, GTK_SIGNAL_FUNC(add_buddy_callback));
-	gaim_new_item(menu, _("Join A Chat"), GTK_SIGNAL_FUNC(chat_callback));
+	gaim_new_item_with_pixmap(menu, _("Join A Chat"), add_small_xpm, GTK_SIGNAL_FUNC(chat_callback));
         gaim_seperator(menu);
-        gaim_new_item(menu, _("Import Buddy List"), GTK_SIGNAL_FUNC(import_callback));
-        gaim_new_item(menu, _("Export Buddy List"), GTK_SIGNAL_FUNC(export_callback));
+        gaim_new_item_with_pixmap(menu, _("Import Buddy List"), import_small_xpm, GTK_SIGNAL_FUNC(import_callback));
+        gaim_new_item_with_pixmap(menu, _("Export Buddy List"), add_small_xpm,GTK_SIGNAL_FUNC(export_callback));
 	if (!(general_options & OPT_GEN_REGISTERED))
 	{
         	gaim_seperator(menu);
-		gaim_new_item(menu, _("Register"), GTK_SIGNAL_FUNC(gaimreg_callback));
+		gaim_new_item_with_pixmap(menu, _("Register"), add_small_xpm, GTK_SIGNAL_FUNC(gaimreg_callback));
 	}
 	gaim_seperator(menu);
-	gaim_new_item(menu, _("Signoff"), GTK_SIGNAL_FUNC(signoff));
+	gaim_new_item_with_pixmap(menu, _("Signoff"), add_small_xpm, GTK_SIGNAL_FUNC(signoff));
 
 #ifndef USE_APPLET
-	gaim_new_item(menu, _("Quit"), GTK_SIGNAL_FUNC(do_quit));
+	gaim_new_item_with_pixmap(menu, _("Quit"), add_small_xpm, GTK_SIGNAL_FUNC(do_quit));
 #else
-	gaim_new_item(menu, _("Close"), GTK_SIGNAL_FUNC(applet_destroy_buddy));
+	gaim_new_item_with_pixmap(menu, _("Close"), add_small_xpm, GTK_SIGNAL_FUNC(applet_destroy_buddy));
 #endif
 
 	menu = gtk_menu_new();