# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1184908186 0
# Node ID 44e07aa8386a07deae0cc442e9da504946f052e5
# Parent  36257cac2b11517ad3fed6e58100e8d964ba1cfc
Merge the two patches from this ticket, fix them, and be sure to install
a few icons that for some reason were forgotten.  Fixes #2096

diff -r 36257cac2b11 -r 44e07aa8386a pidgin/pixmaps/emotes/default/22/Makefile.am
--- a/pidgin/pixmaps/emotes/default/22/Makefile.am	Thu Jul 19 21:34:35 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.am	Fri Jul 20 05:09:46 2007 +0000
@@ -6,6 +6,7 @@
 		angel.png \
 		angry.png \
 		arrogant.png \
+		at-wits-end.png \
 		bad.png \
 		bashful.png \
 		beat-up.png \
@@ -56,6 +57,7 @@
 		embarrassed.png \
 		excruciating.png \
 		eyeroll.png \
+		female-fighter.png \
 		film.png \
 		fingers-crossed.png \
 		flag.png \
@@ -104,6 +106,7 @@
 		musical-note.png \
 		nailbiting.png \
 		neutral.png \
+		on-the-phone.png \
 		party.png \
 		peace.png \
 		phone.png \
@@ -154,6 +157,7 @@
 		sweat.png \
 		teeth.png \
 		terror.png \
+		time-out.png \
 		thinking.png \
 		thunder.png \
 		tongue.png \
diff -r 36257cac2b11 -r 44e07aa8386a pidgin/pixmaps/emotes/default/22/default.theme.in
--- a/pidgin/pixmaps/emotes/default/22/default.theme.in	Thu Jul 19 21:34:35 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/default.theme.in	Fri Jul 20 05:09:46 2007 +0000
@@ -29,7 +29,7 @@
 smile.png           :-)     :)
 wink.png            ;-)     ;)
 sad.png             :-(     :(
-tongue.png          :-P     :P      :-p
+tongue.png          :-P     :P      :-p    :p
 shock.png           =-O
 kiss.png            :-*
 shout.png           >:o
@@ -229,35 +229,36 @@
 ! skywalker.png     C:-)    c:-)    C:)     c:)
 ! monkey.png        :-(|)
 
-### Following ICQ 5.1
+### Following ICQ 6.0
 [ICQ]
 smile.png           :-)     :)
+neutral.png         :-$
 sad.png             :-(     :(
+shock.png           =-O
 wink.png            ;-)     ;)
-tongue.png          :-P     :P
+tongue.png          :-P     :P      :-p     :p
+#[:-}
 laugh.png           *JOKINGLY*
+sleepy.png          *TIRED*
 crying.png          :'(
+sick.png            :-!
 #*KISSED*
+#*STOP*
 kiss.png            :-*
+#*KISSING* 
 embarrassed.png     :-[
+devil.png           ]:->
 angel.png           O:-)
-shut-mouth.png      :-X     :X
+rose.png            @}->--
+shut-mouth.png      :-X     :X      :-x     :x
+bomb.png            @=
 thinking.png        :-\\    :-/
+good.png            *THUMBS\ UP*
 shout.png           >:o     >:O
+beer.png            *DRINK*
 smile-big.png       :-D     :D
 moneymouth.png      :-$
-shock.png           =-O
 glasses-cool.png    8-)
-#[:-}
-sleepy.png          *TIRED*
-sick.png            :-!
-#*STOP*
-#*KISSING* 
-devil.png           ]:->
-rose.png            @}->--
-bomb.png            @=
-good.png            *THUMBS\ UP*
-beer.png            *DRINK*
 in-love.png         *IN\ LOVE*
 ! skywalker.png     C:-)    c:-)    C:)     c:)
 ! monkey.png        :-(|)
@@ -272,7 +273,7 @@
 sick.png            :-&
 yawn.png            (:|
 hypnotized.png      @-)
-#on_the_phone       :)]     MISSING: "Wait,I'm phoning!" (not phone.png)    => smily showing phone and hand ("stop")
+on-the-phone.png    :)]
 sad.png             :(      :-(
 in-love.png         :x      :-x     :X      :-X
 angry.png           X-(     x-(     X(      x(
@@ -290,7 +291,7 @@
 arrogant.png        [-(
 thinking.png        :-?
 waiting.png         :-w     :-W
-#at_wits_end        ~x(     ~X(     MISSING: "Why.Does.This.Not.Work.AAAAARGH!!"    => angry smily shouting and pulling hair off
+at-wits-end.png     ~x(     ~X(
 smile-big.png       :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
 glasses-cool.png    B-)     b-)
@@ -308,7 +309,7 @@
 silly.png           8-}
 clap.png            =D>     =d>
 mad-tongue.png      >:P     >:p
-#timeout            :-t     :-T     MISSING: "Let's have a break."
+time-out.png        :-t     :-T
 hug-left.png        >:D<    >:d<
 love-over.png       =((
 sweat.png           #:-S    #:-s
@@ -350,8 +351,8 @@
 #youkiddingme.png   :-j :-J
 
 ### These only work in a certain IMvironment
-#malefighter1.png   o->     O->
-#malefighter2.png   o=>     O=>
-#femalefighter.png  o-+     O-+
+#male-fighter1.png  o->     O->
+#male-fighter2.png  o=>     O=>
+female-fighter.png  o-+     O-+
 yin-yang.png        (%)