# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177421322 0
# Node ID 30f2fdcea12ca1cc4d87d427d8e823c42b3d8b7a
# Parent  bae9211543519537897d2f87515d2443b1882550# Parent  f767d73699a97ec979dab5f021e12438c7771d5d
propagate from branch 'im.pidgin.pidgin' (head c33cbe1ca040482d72c165cedf821bcedb280179)
            to branch 'im.pidgin.rlaager.gaim_migration' (head 1e6435d63197f439a3d976033664ab9d580625e3)

diff -r bae921154351 -r 30f2fdcea12c pidgin/pixmaps/emotes/default/22/giggle.png
Binary file pidgin/pixmaps/emotes/default/22/giggle.png has changed
diff -r bae921154351 -r 30f2fdcea12c pidgin/pixmaps/emotes/default/22/mad-tongue.png
Binary file pidgin/pixmaps/emotes/default/22/mad-tongue.png has changed
diff -r bae921154351 -r 30f2fdcea12c pidgin/pixmaps/emotes/default/22/nailbiting.png
Binary file pidgin/pixmaps/emotes/default/22/nailbiting.png has changed
diff -r bae921154351 -r 30f2fdcea12c pidgin/pixmaps/emotes/default/22/theme
--- a/pidgin/pixmaps/emotes/default/22/theme	Tue Apr 24 13:27:42 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Tue Apr 24 13:28:42 2007 +0000
@@ -1,5 +1,5 @@
 Name=Default
-Description=Default Pidgin smileys
+Description=Pidgin smileys (default)
 Icon=smile.png
 Author=Hylke Bons
 
@@ -36,13 +36,13 @@
 foot-in-mouth.png   :-!
 embarrassed.png     :-[
 angel.png           O:-)
-thinking.png        :-\
+thinking.png        :-\\
 crying.png          :'(
 shut-mouth.png      :-X
 glasses-cool.png    8-)
 
 ### Following JEP 0038
-[Jabber]
+[XMPP]
 smile.png           :-)     :)
 sad.png             :-(     :(
 wink.png            ;-)     ;)
@@ -254,7 +254,7 @@
 embarrassed.png     :-[
 angel.png           O:-)
 shut-mouth.png      :-X :X
-thinking.png        :-\
+thinking.png        :-\\
 shout.png           >:o >:O
 smile-big.png       :-D :D
 moneymouth.png      :-$
@@ -268,14 +268,14 @@
 devil.png           ]:->
 rose.png            @}->--
 bomb.png            @=
-good.png            *THUMBS UP*
+good.png            *THUMBS\ UP*
 beer.png            *DRINK*
-in-love.png         *IN LOVE*
+in-love.png         *IN\ LOVE*
 
 ### Following Yahoo! Messenger 8.1
 [Yahoo]
 smile.png           :) :-)
-question.png        :-/ :-\
+question.png        :-/ :-\\
 shock.png           :-O :O :-o :o 
 devil.png           >:)
 angel.png           O:-) o:-) 0:-)
@@ -299,7 +299,7 @@
 bye.png             =;
 arrogant.png        [-(
 thinking.png        :-?
-waiting.png         :-w :-W         
+waiting.png         :-w :-W               
 #at_wits_end        ~x( ~X(         MISSING: "Why.Does.This.Not.Work.AAAAARGH!!"    => angry smily shouting and pulling hair off
 smile-big.png       :D :-D :d :-d
 tongue.png          :-P :P :-p :p
@@ -325,7 +325,6 @@
 rotfl.png           =))    
 #loser              L-) l-)         MISSING/YAHOO 6: "Loser!"
 party.png	          <:-P <:-p
-tremble.png         :-SS :-Ss :-sS :-ss
 cowboy.png          <):)
 desire.png          8->
 alien.png		        =:) >-)
@@ -333,7 +332,7 @@
 chicken.png		      ~:>
 coffee.png		      ~o) ~O)
 cow.png			        3:-O 3:-o
-dance.png		        \:D/ \:d/
+dance.png		        \\:D/ \\:d/
 rose.png		        @};-
 dont-know.png	    	:-L :-l
 skeleton.png		    8-X 8-x
@@ -349,10 +348,10 @@
 clover.png		      %%-
 musical-note.png	  :-"
 nailbiting.png      :-SS :-ss
-giggle.png	        ;))
-worship.png	        ^:)^
+giggle.png	        ;))            
+worship.png	        ^:)^          
 star.png		            (*)
-#yahoo_madtongue.gif	    >:P >:p                 TODO
+mad-tongue.png      >:p
 #yahoo_waving.gif	        >:/                     TODO
 #yahoo_talktohand.gif	    :-@                     TODO
 #yahoo_youkiddingme.gif	    :-j :-J               TODO
diff -r bae921154351 -r 30f2fdcea12c pidgin/pixmaps/emotes/default/22/waiting.png
Binary file pidgin/pixmaps/emotes/default/22/waiting.png has changed
diff -r bae921154351 -r 30f2fdcea12c pidgin/pixmaps/emotes/default/22/worship.png
Binary file pidgin/pixmaps/emotes/default/22/worship.png has changed