# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 967585195 0
# Node ID 9d5e7e9871038a5b9d38aa2cabe307f43570cd29
# Parent  00c56b54e92c70bf4e0dc5a25b1e61b35b5bc3ec
[gaim-migrate @ 800]
Shut up, Eric.

:-P

committer: Tailor Script <tailor@pidgin.im>

diff -r 00c56b54e92c -r 9d5e7e987103 pixmaps/big.xpm
--- a/pixmaps/big.xpm	Tue Aug 29 19:08:57 2000 +0000
+++ b/pixmaps/big.xpm	Tue Aug 29 21:39:55 2000 +0000
@@ -1,7 +1,7 @@
 /* XPM */
 static char *big_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"22 17 7 1",
+"17 13 7 1",
 "  c Gray0",
 ". c Gray40",
 "X c #666666669999",
@@ -10,21 +10,17 @@
 "+ c Gray60",
 "@ c None",
 /* pixels */
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@ @@@@@@@ @@@@@@@",
-"@@@@@   @@@@@@ @@@@@@@",
-"@@@@     @@@@   @@@@@@",
-"@@@@     @@@@   @@@@@@",
-"@@@@ . . @@@  @  @@@@@",
-"@@@@XOXO.@@@  @  @@@@@",
-"@@@@OXOX@@@@     @@@@@",
-"@@@@XOXO.@@  @@@  @@@@",
-"@@@@@@@@@@@  @@@  @@@@",
-"@@@@@@@@@@    @    @@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"
+"@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@",
+"@@@ @@@@@@@ @@@@@",
+"@@   @@@@@@ @@@@@",
+"@     @@@@   @@@@",
+"@     @@@@   @@@@",
+"@ . . @@@  @  @@@",
+"@XOXO.@@@  @  @@@",
+"@OXOX@@@@     @@@",
+"@XOXO.@@  @@@  @@",
+"@@@@@@@@  @@@  @@",
+"@@@@@@@    @    @",
+"@@@@@@@@@@@@@@@@@",
 };
diff -r 00c56b54e92c -r 9d5e7e987103 pixmaps/small.xpm
--- a/pixmaps/small.xpm	Tue Aug 29 19:08:57 2000 +0000
+++ b/pixmaps/small.xpm	Tue Aug 29 21:39:55 2000 +0000
@@ -1,28 +1,24 @@
 /* XPM */
 static char *small_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"22 17 5 1",
+"17 13 5 1",
 "  c Gray0",
 ". c Gray40",
 "X c Magenta",
 "o c Gray60",
 "O c None",
 /* pixels */
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOO.o.o.OOOO",
-"OOOOOOOOOOOOOo.o.oOOOO",
-"OOOOOOOOOOOOO.o.o.OOOO",
-"OOOOOOO OOOOO  .  OOOO",
-"OOOOOOO OOOOO     OOOO",
-"OOOOOO   OOOO     OOOO",
-"OOOOOO O OOOOO   OOOOO",
-"OOOOO  O  OOOOO OOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOO"
+"OOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOO",
+"OOOOOOOOOO.o.o.OO",
+"OOOOOOOOOOo.o.oOO",
+"OOOOOOOOOO.o.o.OO",
+"OOOO OOOOO  .  OO",
+"OOOO OOOOO     OO",
+"OOO   OOOO     OO",
+"OOO O OOOOO   OOO",
+"OO  O  OOOOO OOOO",
+"OOOOOOOOOOOOOOOOO",
 };
diff -r 00c56b54e92c -r 9d5e7e987103 pixmaps/smile_icon.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/smile_icon.xpm	Tue Aug 29 21:39:55 2000 +0000
@@ -0,0 +1,49 @@
+/* XPM */
+static char * smile_icon_xpm[] = {
+"13 13 33 1",
+" 	c None",
+".	c #424200",
+"+	c #515100",
+"@	c #313100",
+"#	c #939300",
+"$	c #E8E800",
+"%	c #FFFF00",
+"&	c #EBEB00",
+"*	c #FEFE00",
+"=	c #D1D100",
+"-	c #AAAA00",
+";	c #222200",
+">	c #B9B900",
+",	c #6B6B00",
+"'	c #000000",
+")	c #868600",
+"!	c #2A2A00",
+"~	c #C6C600",
+"{	c #F4F400",
+"]	c #EEEE00",
+"^	c #E3E300",
+"/	c #767600",
+"(	c #A8A800",
+"_	c #D2D200",
+":	c #8C8C00",
+"<	c #BDBD00",
+"[	c #EDED00",
+"}	c #646400",
+"|	c #673A00",
+"1	c #C46E00",
+"2	c #F1F100",
+"3	c #836700",
+"4	c #511B00",
+"    .+++.    ",
+"  @#$%%%$#@  ",
+" @&*=%%%=*&@ ",
+" #*-;>%>;-*# ",
+".$%,')%)',%$.",
+"+%%>!~%~!>%%+",
+"+%{]^%%%^]{%+",
+"+%/(%%%%%(/%+",
+".$_:<[{[<:_$.",
+" #*%}|1|}%*# ",
+" @&*23432*&@ ",
+"  @#$%%%$#@  ",
+"    .+++.    "};
diff -r 00c56b54e92c -r 9d5e7e987103 src/aim.c
--- a/src/aim.c	Tue Aug 29 19:08:57 2000 +0000
+++ b/src/aim.c	Tue Aug 29 21:39:55 2000 +0000
@@ -594,6 +594,7 @@
         
 
         show_login();
+	new_conversation("poot");
         gtk_main();
         
 #endif /* USE_APPLET */
diff -r 00c56b54e92c -r 9d5e7e987103 src/conversation.c
--- a/src/conversation.c	Tue Aug 29 19:08:57 2000 +0000
+++ b/src/conversation.c	Tue Aug 29 21:39:55 2000 +0000
@@ -43,7 +43,7 @@
 #include "pixmaps/big.xpm"
 #include "pixmaps/fontface.xpm"
 #include "pixmaps/speaker.xpm"
-/* #include "pixmaps/aimicon2.xpm" */
+#include "pixmaps/smile_icon.xpm"
 #include "pixmaps/wood.xpm"
 #include "pixmaps/palette.xpm"
 #include "pixmaps/link.xpm"
@@ -1319,7 +1319,7 @@
 	underline_p = gtk_pixmap_new(underline_i, mask);
 	gtk_widget_show(underline_p);
 	small_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, bold_xpm );
+             &win->style->white, small_xpm );
 	small_p = gtk_pixmap_new(small_i, mask);
 	gtk_widget_show(small_p);
 	normal_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
@@ -1327,14 +1327,14 @@
 	normal_p = gtk_pixmap_new(normal_i, mask);
 	gtk_widget_show(normal_p);
 	big_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, bold_xpm );
+             &win->style->white, big_xpm );
 	big_p = gtk_pixmap_new(big_i, mask);
 	gtk_widget_show(big_p);
 	font_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
 			&win->style->white, bold_xpm );
 	font_p = gtk_pixmap_new(font_i, mask);
 	gtk_widget_show(font_p);
-	smiley_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, bold_xpm);
+	smiley_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, smile_icon_xpm);
 	smiley_p = gtk_pixmap_new(smiley_i, mask);
 	gtk_widget_show(smiley_p);