# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 968661294 0
# Node ID 450db0a5bbe444a0b30a7526f4d3e333492d0e66
# Parent  69669b9b3e3b56bf68d634f7d0f1672dc727267e
[gaim-migrate @ 885]
Bleh

committer: Tailor Script <tailor@pidgin.im>

diff -r 69669b9b3e3b -r 450db0a5bbe4 ChangeLog
--- a/ChangeLog	Mon Sep 11 00:58:15 2000 +0000
+++ b/ChangeLog	Mon Sep 11 08:34:54 2000 +0000
@@ -13,7 +13,7 @@
 	* Background colors
 	* Redesigned preferences dialog
 	* Redesigned conversation dialog
-	* Removed the Lag-O-Meter
+	* Removed the Lag-O-Meter (Lag-O-Meter is now a plugin)
 	* Socks 4/5 Proxy works
 	* Buddy Pounces are now saved in .gaimrc
 	* Buddy Chats are now saved in .gaimrc
diff -r 69669b9b3e3b -r 450db0a5bbe4 pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Mon Sep 11 00:58:15 2000 +0000
+++ b/pixmaps/Makefile.am	Mon Sep 11 08:34:54 2000 +0000
@@ -51,6 +51,7 @@
 		gnome/penguin-connect.png	\
 		gnome/penguin-offline.png	\
 		gnome/penguin-online.png	\
+		group.xpm			\
 		im.xpm				\
 		import_small.xpm		\
 		info.xpm			\
diff -r 69669b9b3e3b -r 450db0a5bbe4 pixmaps/group.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/group.xpm	Mon Sep 11 08:34:54 2000 +0000
@@ -0,0 +1,91 @@
+/* XPM */
+static char * group_xpm[] = {
+"24 24 64 1",
+" 	c None",
+".	c #000000",
+"+	c #BEBEBE",
+"@	c #9A9A9A",
+"#	c #F0F0F0",
+"$	c #DADADA",
+"%	c #D4D4D4",
+"&	c #ECECEC",
+"*	c #F2F2F2",
+"=	c #EFEFEF",
+"-	c #EDEDED",
+";	c #AEAEAE",
+">	c #EAEAEA",
+",	c #EEEEEE",
+"'	c #E7E7E7",
+")	c #B2B2B2",
+"!	c #E9E9E9",
+"~	c #D0D0D0",
+"{	c #D3D3D3",
+"]	c #A0A0A0",
+"^	c #E4E4E4",
+"/	c #A2A2A2",
+"(	c #E0E0E0",
+"_	c #F5F5F5",
+":	c #F6F6F6",
+"<	c #D9D9D9",
+"[	c #BFBFBF",
+"}	c #D5D5D5",
+"|	c #E5E5E5",
+"1	c #F3F3F3",
+"2	c #8A8A8A",
+"3	c #636363",
+"4	c #CECECE",
+"5	c #CACACA",
+"6	c #DCDCDC",
+"7	c #DEDEDE",
+"8	c #DFDFDF",
+"9	c #515151",
+"0	c #9E9E9E",
+"a	c #F1F1F1",
+"b	c #EBEBEB",
+"c	c #939393",
+"d	c #656565",
+"e	c #5B5B5B",
+"f	c #C6C6C6",
+"g	c #808080",
+"h	c #C3C3C3",
+"i	c #737373",
+"j	c #A6A6A6",
+"k	c #DBDBDB",
+"l	c #616161",
+"m	c #6A6A6A",
+"n	c #6C6C6C",
+"o	c #ACACAC",
+"p	c #242424",
+"q	c #2A2A2A",
+"r	c #D8D8D8",
+"s	c #0C0C0C",
+"t	c #161616",
+"u	c #575757",
+"v	c #838383",
+"w	c #777777",
+"x	c #A8A8A8",
+"y	c #4F4F4F",
+"                        ",
+"                        ",
+"       .+@#             ",
+"      .++##             ",
+"     .+$####            ",
+"    .+###%##            ",
+"   .+##&##*=-           ",
+"  .;###%>#%,'           ",
+" .)##%##%!#~'{          ",
+" .]##-%##&,,^/(=_::::;  ",
+"  .<###*##~![}|1::::;2  ",
+"  .3|##-},!456,7:8::29. ",
+"   .0##ab~;c<,_::::;de. ",
+"    .<##f+g(&_8:88:29.  ",
+"    .3|=hijk#:::::;de.  ",
+"     .l&im8!_88:8:2c.   ",
+"     ..9no|a_::::;dn.   ",
+"     ..pq+r#:::::2c.    ",
+"      .stu++++kk[dn.    ",
+"       ...2v++++wc.     ",
+"          ...ix+we.     ",
+"             ...y.      ",
+"                ..      ",
+"                        "};
diff -r 69669b9b3e3b -r 450db0a5bbe4 src/buddy.c
--- a/src/buddy.c	Mon Sep 11 00:58:15 2000 +0000
+++ b/src/buddy.c	Mon Sep 11 08:34:54 2000 +0000
@@ -80,6 +80,9 @@
 #include "pixmaps/tmp_send.xpm"
 #include "pixmaps/tb_search.xpm"
 #include "pixmaps/join.xpm"
+#include "pixmaps/gnome_add.xpm"
+#include "pixmaps/gnome_remove.xpm"
+#include "pixmaps/group.xpm"
 
 static GtkTooltips *tips;
 static GtkWidget *editpane;
@@ -244,15 +247,10 @@
 void update_button_pix()
 {
 
-	if (display_options & OPT_DISP_DEVIL_PIXMAPS) {
-		adjust_pic(addbutton, _("Add"), (gchar **)daemon_buddyadd_xpm);
-		adjust_pic(groupbutton, _("Group"), NULL);
-		adjust_pic(rembutton, _("Remove"), (gchar **)daemon_buddydel_xpm);
-	} else {
-		adjust_pic(addbutton, _("Add"), (gchar **)buddyadd_xpm);
-		adjust_pic(groupbutton, _("Group"), NULL);
-		adjust_pic(rembutton, _("Remove"), (gchar **)buddydel_xpm);
-	}
+	adjust_pic(addbutton, _("Add"), (gchar **)gnome_add_xpm);
+	adjust_pic(groupbutton, _("Group"), (gchar **)group_xpm);
+	adjust_pic(rembutton, _("Remove"), (gchar **)gnome_remove_xpm);
+
 	if (!(display_options & OPT_DISP_NO_BUTTONS)) {
 		adjust_pic(chatbutton, _("Chat"), (gchar **)join_xpm);
 	        adjust_pic(imbutton, _("IM"), (gchar **)tmp_send_xpm);