# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1228016850 0
# Node ID 35037aa8c9c51592f08e2bbe3b7c59924bbfea92
# Parent  491bf0159ecb1cbb9f5ed73c02236517e0316051
XMPP smiley definitions from Kahlil Robinson, slightly tweaked.  Fixes #3307.

diff -r 491bf0159ecb -r 35037aa8c9c5 COPYRIGHT
--- a/COPYRIGHT	Sun Nov 30 00:07:06 2008 +0000
+++ b/COPYRIGHT	Sun Nov 30 03:47:30 2008 +0000
@@ -338,6 +338,7 @@
 Dennis Ristuccia
 Lee Roach
 Eion Robb
+Kahlil Robinson
 Rhett Robinson
 Luciano Miguel Ferreira Rocha
 Andrew Rodland
diff -r 491bf0159ecb -r 35037aa8c9c5 pidgin/pixmaps/emotes/default/24/default.theme.in
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in	Sun Nov 30 00:07:06 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in	Sun Nov 30 03:47:30 2008 +0000
@@ -392,3 +392,20 @@
 wink.png	    ;-)     ;)
 sad.png		    :[
 kiss.png            :x
+
+[XMPP]
+# XMPP emoticons
+smile.png                 :)    :-)    =)
+smile-big.png             :D    :-D    =D
+wink.png                  ;)    ;-)    ;^)
+shock.png                 :-o
+tongue.png                :P    :-P
+glasses-cool.png          B-)
+angry.png                 X-(
+sad.png                   :(
+crying.png                :'(
+neutral.png               :-|
+thinking.png              :-/
+love.png                  <3
+monkey.png                :(|)
+victory.png               \\m/
diff -r 491bf0159ecb -r 35037aa8c9c5 pidgin/pixmaps/emotes/small/16/small.theme.in
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in	Sun Nov 30 00:07:06 2008 +0000
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in	Sun Nov 30 03:47:30 2008 +0000
@@ -154,3 +154,20 @@
 wink.png	    ;-)     ;)
 sad.png		    :[
 kiss.png            :x
+
+[XMPP]
+# XMPP emoticons
+smile.png                 :)    :-)    =)
+smile-big.png             :D    :-D    =D
+wink.png                  ;)    ;-)    ;^)
+shock.png                 :-o
+tongue.png                :P    :-P
+glasses-cool.png          B-)
+angry.png                 X-(
+sad.png                   :(
+crying.png                :'(
+neutral.png               :-|
+thinking.png              :-/
+love.png                  <3
+monkey.png                :(|)
+victory.png               \\m/