# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1226891215 0
# Node ID 6e6f7e69e0d4397a9c4383be479eff2483823edc
# Parent  7b2981282c0a12912b87663d47ef29608f151d10
Round three of icon renaming.  This is probably all I'm going to do for now.

diff -r 7b2981282c0a -r 6e6f7e69e0d4 .mtn-ignore
--- a/.mtn-ignore	Mon Nov 17 02:30:42 2008 +0000
+++ b/.mtn-ignore	Mon Nov 17 03:06:55 2008 +0000
@@ -37,6 +37,7 @@
 pidgin-.*.tar.bz2
 pidgin-*.*.*-win32bin$
 pidgin/pidgin$
+pidgin/pixmaps/emblems/16/afraid.png
 pidgin/pixmaps/emblems/16/amorous.png
 pidgin/pixmaps/emblems/16/angry.png
 pidgin/pixmaps/emblems/16/beer.png
@@ -48,11 +49,15 @@
 pidgin/pixmaps/emblems/16/disappointed.png
 pidgin/pixmaps/emblems/16/embarrassed.png
 pidgin/pixmaps/emblems/16/excited.png
+pidgin/pixmaps/emblems/16/happy.png
+pidgin/pixmaps/emblems/16/hot.png
+pidgin/pixmaps/emblems/16/hungry.png
 pidgin/pixmaps/emblems/16/in_love.png
 pidgin/pixmaps/emblems/16/mean.png
 pidgin/pixmaps/emblems/16/meeting.png
 pidgin/pixmaps/emblems/16/mobile.png
 pidgin/pixmaps/emblems/16/musical-note.png
+pidgin/pixmaps/emblems/16/nervous.png
 pidgin/pixmaps/emblems/16/neutral.png
 pidgin/pixmaps/emblems/16/party.png
 pidgin/pixmaps/emblems/16/phone.png
@@ -61,6 +66,7 @@
 pidgin/pixmaps/emblems/16/sad.png
 pidgin/pixmaps/emblems/16/sarcastic.png
 pidgin/pixmaps/emblems/16/search.png
+pidgin/pixmaps/emblems/16/shocked.png
 pidgin/pixmaps/emblems/16/sick.png
 pidgin/pixmaps/emblems/16/sleeping.png
 pidgin/pixmaps/emblems/16/sleepy.png
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/Makefile.am
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am	Mon Nov 17 02:30:42 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am	Mon Nov 17 03:06:55 2008 +0000
@@ -57,7 +57,7 @@
     dont-know.png \
     drink.png \
     drool.png \
-    eat.png \
+    hungry.png \
     embarrassed.png \
     excited.png \
     excruciating.png \
@@ -115,7 +115,7 @@
     msn.png \
     musical-note.png \
     music.png \
-    nailbiting.png \
+    nervous.png \
     neutral.png \
     on-the-phone.png \
     party.png \
@@ -145,7 +145,7 @@
     secret.png \
     shame.png \
     sheep.png \
-    shock.png \
+    shocked.png \
     shout.png \
     shut-mouth.png \
     sick.png \
@@ -156,7 +156,7 @@
     skywalker.png \
     sleeping.png \
     sleepy.png \
-    smile.png \
+    happy.png \
     smirk.png \
     snail.png \
     snicker.png \
@@ -168,7 +168,7 @@
     stop.png \
     struggle.png \
     sun.png \
-    sweat.png \
+    hot.png \
     talktohand.png \
     teeth.png \
     terror.png \
@@ -176,7 +176,7 @@
     thunder.png \
     time-out.png \
     tongue.png \
-    tremble.png \
+    afraid.png \
     turtle.png \
     tv.png \
     umbrella.png \
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/afraid.png
Binary file pidgin/pixmaps/emotes/default/24/afraid.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/default.theme.in
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in	Mon Nov 17 02:30:42 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in	Mon Nov 17 03:06:55 2008 +0000
@@ -6,12 +6,12 @@
 
 # Default smileys
 [default]
-smile.png           :)      :-)
+happy.png           :)      :-)
 excited.png         :-D     :-d     :D      :d
 sad.png             :-(     :(
 wink.png            ;-)     ;)
 tongue.png          :P      :-P     :-p     :p
-shock.png           =-O     =-o
+shocked.png         =-O     =-o
 kiss.png            :-*
 glasses-cool.png    8-)
 embarrassed.png     :-[
@@ -29,11 +29,11 @@
 
 # Following AIM 6.1
 [AIM]
-smile.png           :-)     :)
+happy.png           :-)     :)
 wink.png            ;-)     ;)
 sad.png             :-(     :(
 tongue.png          :-P     :P      :-p    :p
-shock.png           =-O
+shocked.png         =-O
 kiss.png            :-*
 shout.png           >:o
 excited.png         :-D     :D
@@ -51,10 +51,10 @@
 
 # Following Windows Live Messenger 8.1
 [MSN]
-smile.png           :)      :-)
+happy.png           :)      :-)
 excited.png         :D      :d :-D :-d
 wink.png            ;)      ;-)
-shock.png           :-O     :-o :O :o
+shocked.png         :-O     :-o :O :o
 tongue.png          :P      :p :-P :-p
 glasses-cool.png    (H)     (h)
 angry.png           :@      :-@
@@ -139,7 +139,7 @@
 
 # Following QQ 2006
 [QQ]
-shock.png           /:O      /jy       /surprised
+shocked.png         /:O      /jy       /surprised
 curl-lip.png        /:~      /pz       /curl_lip
 desire.png          /:*      /se       /desire
 dazed.png           /:|      /dazed
@@ -153,7 +153,7 @@
 pissed-off.png      /:@      /fn       /pissed_off
 act-up.png          /:P      /tp       /act_up
 excited.png         /:D      /cy       /toothy_smile
-smile.png           /:)      /wx       /small_smile
+happy.png           /:)      /wx       /small_smile
 sad.png             /:(      /ng       /sad
 glasses-cool.png    /:+      /kuk      /cool
 doctor.png          /:#      /feid     /SARS
@@ -166,7 +166,7 @@
 starving.png        /:g      /jie      /starving
 sleepy.png          /|-)     /kun      /sleepy
 terror.png          /:!      /jk       /terror
-sweat.png           /:L      /sweat
+hot.png             /:L      /sweat
 smirk.png           /:>      /hanx     /smirk
 soldier.png         /:;      /db       /soldier
 struggle.png        /;f      /fendou   /struggle
@@ -180,7 +180,7 @@
 hammer.png          /xx      /qiao     /hammer
 bye.png             /bye     /zj       /bye
 go-away.png         /go      /shan     /go
-tremble.png         /shake   /fad      /shake
+afraid.png          /shake   /fad      /shake
 amorous.png         /love    /aiq      /love
 jump.png            /jump    /tiao     /jump
 search.png          /find    /zhao     /search
@@ -200,7 +200,7 @@
 musical-note.png    /music   /yy       /music
 poop.png            /shit    /bb       /shit
 coffee.png          /coffee  /kf       /coffee
-eat.png             /eat     /fan      /eat
+hungry.png          /eat     /fan      /eat
 pill.png            /pill    /yw       /pill
 rose.png            /rose    /mg       /rose
 wilt.png            /fade    /dx       /wilt
@@ -238,10 +238,10 @@
 
 # Following ICQ 6.0
 [ICQ]
-smile.png           :-)     :)
+happy.png           :-)     :)
 neutral.png         :-$
 sad.png             :-(     :(
-shock.png           =-O
+shocked.png         =-O
 wink.png            ;-)     ;)
 tongue.png          :-P     :P      :-p     :p
 music.png           [:-}
@@ -274,9 +274,9 @@
 
 # Following Yahoo! Messenger 8.1
 [Yahoo]
-smile.png           :)      :-)
+happy.png           :)      :-)
 question.png        :-/     :-\\
-shock.png           :-O     :O      :-o     :o 
+shocked.png         :-O     :O      :-o     :o 
 devil.png           >:)
 angel.png           O:-)    o:-)    0:-)
 sick.png            :-&
@@ -321,11 +321,11 @@
 time-out.png        :-t     :-T
 hug-left.png        >:D<    >:d<
 love-over.png       =((
-sweat.png           #:-S    #:-s
+hot.png             #:-S    #:-s
 rotfl.png           =)) :-j :-J 
 loser.png           L-)     l-)
 party.png           <:-P    <:-p
-nailbiting.png      :-SS	:-Ss	:-sS	:-ss
+nervous.png         :-SS	:-Ss	:-sS	:-ss
 cowboy.png          <):)
 desire.png          8->
 ! skywalker.png     C:-)    c:-)    C:)     c:)
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/eat.png
Binary file pidgin/pixmaps/emotes/default/24/eat.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/happy.png
Binary file pidgin/pixmaps/emotes/default/24/happy.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/hot.png
Binary file pidgin/pixmaps/emotes/default/24/hot.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/hungry.png
Binary file pidgin/pixmaps/emotes/default/24/hungry.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/nailbiting.png
Binary file pidgin/pixmaps/emotes/default/24/nailbiting.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/nervous.png
Binary file pidgin/pixmaps/emotes/default/24/nervous.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/shock.png
Binary file pidgin/pixmaps/emotes/default/24/shock.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/shocked.png
Binary file pidgin/pixmaps/emotes/default/24/shocked.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/smile.png
Binary file pidgin/pixmaps/emotes/default/24/smile.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/sweat.png
Binary file pidgin/pixmaps/emotes/default/24/sweat.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/default/24/tremble.png
Binary file pidgin/pixmaps/emotes/default/24/tremble.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/small/16/TODO
--- a/pidgin/pixmaps/emotes/small/16/TODO	Mon Nov 17 02:30:42 2008 +0000
+++ b/pidgin/pixmaps/emotes/small/16/TODO	Mon Nov 17 03:06:55 2008 +0000
@@ -1,12 +1,18 @@
 The following icons where just scaled down from the 24x24 and may need work:
+	afraid.png
+	amorous.png
 	disappointed.png
 	embarrassed.png
+	happy.png
+	hot.png
+	hungry.png
 	mean.png
-	amorous.png
 	meeting.png
+	nervous.png
 	question.png
 	sarcastic.png
 	search.png
+	shocked.png
 	sleepy.png
 	smile-big.png
 	tv.png
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/small/16/afraid.png
Binary file pidgin/pixmaps/emotes/small/16/afraid.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/small/16/happy.png
Binary file pidgin/pixmaps/emotes/small/16/happy.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/small/16/hot.png
Binary file pidgin/pixmaps/emotes/small/16/hot.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/small/16/hungry.png
Binary file pidgin/pixmaps/emotes/small/16/hungry.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/small/16/nervous.png
Binary file pidgin/pixmaps/emotes/small/16/nervous.png has changed
diff -r 7b2981282c0a -r 6e6f7e69e0d4 pidgin/pixmaps/emotes/small/16/shocked.png
Binary file pidgin/pixmaps/emotes/small/16/shocked.png has changed