# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1008066946 0
# Node ID 48123cba5a878bc843db7f0963f710407f8c9811
# Parent  26be84883f91d685ac5bcd0d260dd14b918322a9
[gaim-migrate @ 2887]
t
h
i
s

i
s

n
o
t

a

t
e
s
t
.



t
h
i
s

i
s

n
o
t

a

t
e
s
t
.



t
h
i
s

i
s

n
o
t

a

t
e
s
t
.

committer: Tailor Script <tailor@pidgin.im>

diff -r 26be84883f91 -r 48123cba5a87 pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Tue Dec 11 08:24:13 2001 +0000
+++ b/pixmaps/Makefile.am	Tue Dec 11 10:35:46 2001 +0000
@@ -32,6 +32,7 @@
 		download.xpm			\
 		embarrassed.xpm			\
 		exit_small.xpm			\
+		farted.xpm			\
 		fgcolor.xpm			\
 		fontface.xpm			\
 		fontface2.xpm			\
diff -r 26be84883f91 -r 48123cba5a87 pixmaps/farted.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/farted.xpm	Tue Dec 11 10:35:46 2001 +0000
@@ -0,0 +1,32 @@
+/* XPM */
+static char * farted2_xpm[] = {
+"19 19 10 1",
+" 	c None",
+".	c #000000",
+"+	c #CCCC00",
+"@	c #FFFF00",
+"#	c #D8D83F",
+"$	c #666633",
+"%	c #FFFFFF",
+"&	c #FFCC00",
+"*	c #FF9900",
+"=	c #999933",
+"      .......      ",
+"    ..+@@@@@+..    ",
+"   .+@@@@@@@@@+.   ",
+"  .@@@@@@@@@@@@@.  ",
+" .+@@@.@@@@@.@@@+. ",
+" .@@@.@@@@@@@.@@@. ",
+".#@@.$..@@@..$.@@+.",
+".@@.$%.%.@.%.%$.@@.",
+".@@@$%.%.@.%.%$@@@.",
+".@@@&.%%.@.%%.&@@@.",
+".@&&&&..@@@..&&&@@.",
+".@&&**&@@@@@&**&&@.",
+".+&****&@@@&****&+.",
+" .&&*..&@@@&..*&&. ",
+" .&&&=&.....&=&&&. ",
+"  .&&&@@@@@@@&&&.  ",
+"   .+*@@***@@*+.   ",
+"    ..+@@@@@+..    ",
+"      .......      "};
diff -r 26be84883f91 -r 48123cba5a87 src/conversation.c
--- a/src/conversation.c	Tue Dec 11 08:24:13 2001 +0000
+++ b/src/conversation.c	Tue Dec 11 10:35:46 2001 +0000
@@ -59,6 +59,7 @@
 #include "pixmaps/crazy4.xpm"
 #include "pixmaps/mrt.xpm"
 #include "pixmaps/download.xpm"
+#include "pixmaps/farted.xpm"
 
 static gchar *ispell_cmd[] = { "ispell", "-a", NULL };
 
@@ -105,6 +106,7 @@
 	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), ":-o)))", mrt_xpm);
 	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), ":-O)))", mrt_xpm);
 	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), "8-|)", download_xpm);
+	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), ":-])", farted_xpm);
 }
 
 void quiet_set(GtkWidget *tb, int state)