# HG changeset patch
# User andrew.victor@mxit.com
# Date 1274083529 0
# Node ID c9dbf4d38c32f98781a9cf178f9c28b0d9ab792a
# Parent  478a75d3100fb5f27127f8cc239cfc64c0786ab0
Added "chilli" and "mrgreen" emoticons [released by MXit under GPL]
Added the MXit standard emoticons to the default theme.

diff -r 478a75d3100f -r c9dbf4d38c32 pidgin/pixmaps/emotes/default/24/Makefile.am
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am	Thu May 13 18:38:52 2010 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am	Mon May 17 08:05:29 2010 +0000
@@ -27,6 +27,7 @@
     car.png \
     cat.png \
     chicken.png \
+    chilli.png \
     cigarette.png \
     clap.png \
     clock.png \
@@ -109,6 +110,7 @@
     moneymouth.png \
     monkey.png \
     moon.png \
+    mrgreen.png \
     msn-away.png \
     msn-busy.png \
     msn_online.png \
diff -r 478a75d3100f -r c9dbf4d38c32 pidgin/pixmaps/emotes/default/24/chilli.png
Binary file pidgin/pixmaps/emotes/default/24/chilli.png has changed
diff -r 478a75d3100f -r c9dbf4d38c32 pidgin/pixmaps/emotes/default/24/default.theme.in
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in	Thu May 13 18:38:52 2010 +0000
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in	Mon May 17 08:05:29 2010 +0000
@@ -451,3 +451,41 @@
 ! monkey.png        :-(|)   :(|)    8-|)
 ! cyclops.png       O-)     o-)
 
+
+# MXit standard emoticons
+[MXit]
+happy.png           :-)     :)
+sad.png             :-(     :(
+wink.png            ;-)     ;)
+excited.png         :-D     :D     :->      :>
+neutral.png         :-|     :|
+shock.png           :-O     :O
+tongue.png          :-P     :P
+embarrassed.png     :-$     :$
+glasses-cool.png    8-)
+in_love.png         (H)
+rose.png            (F)
+### Added in v3.0
+boy.png             (m)
+girl.png            (f)
+star.png            (*)
+chilli.png          (c)
+kiss.png            (x)
+lamp.png            (i)
+pissed-off.png      :e      :-e
+shut-mouth.png      :-x     :x
+thunder.png         (z)
+coffee.png          (U)
+mrgreen.png         (G)
+### Added in v5.0
+sick.png            :o(
+excruciating.png    :-{     :{
+amorous.png         :-}     :}
+eyeroll.png         8-o     8o
+crying.png          :'(
+thinking.png        :-?     :?
+drool.png           :-~     :~
+sleeping.png        :-z     :z
+lying.png           :L)
+glasses-nerdy.png   8-|     8|
+pirate.png          P-)
diff -r 478a75d3100f -r c9dbf4d38c32 pidgin/pixmaps/emotes/default/24/mrgreen.png
Binary file pidgin/pixmaps/emotes/default/24/mrgreen.png has changed