# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1226889042 0
# Node ID 7b2981282c0a12912b87663d47ef29608f151d10
# Parent  b92ae9c512eca3f32c58b069c2ade3fa2629aff4
Round two: Scale down more icons to use as emblems.

diff -r b92ae9c512ec -r 7b2981282c0a .mtn-ignore
--- a/.mtn-ignore	Mon Nov 17 02:07:30 2008 +0000
+++ b/.mtn-ignore	Mon Nov 17 02:30:42 2008 +0000
@@ -43,16 +43,23 @@
 pidgin/pixmaps/emblems/16/busy.png
 pidgin/pixmaps/emblems/16/cigarette.png
 pidgin/pixmaps/emblems/16/coffee.png
+pidgin/pixmaps/emblems/16/confused.png
 pidgin/pixmaps/emblems/16/console.png
+pidgin/pixmaps/emblems/16/disappointed.png
+pidgin/pixmaps/emblems/16/embarrassed.png
 pidgin/pixmaps/emblems/16/excited.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/neutral.png
 pidgin/pixmaps/emblems/16/party.png
 pidgin/pixmaps/emblems/16/phone.png
 pidgin/pixmaps/emblems/16/plate.png
 pidgin/pixmaps/emblems/16/question.png
+pidgin/pixmaps/emblems/16/sad.png
+pidgin/pixmaps/emblems/16/sarcastic.png
 pidgin/pixmaps/emblems/16/search.png
 pidgin/pixmaps/emblems/16/sick.png
 pidgin/pixmaps/emblems/16/sleeping.png
diff -r b92ae9c512ec -r 7b2981282c0a pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Mon Nov 17 02:07:30 2008 +0000
+++ b/pidgin/pixmaps/Makefile.am	Mon Nov 17 02:30:42 2008 +0000
@@ -128,16 +128,23 @@
 		emblems/16/beer.png \
 		emblems/16/cigarette.png \
 		emblems/16/coffee.png \
+		emblems/16/confused.png \
 		emblems/16/console.png \
+		emblems/16/disappointed.png \
+		emblems/16/embarrassed.png \
 		emblems/16/excited.png \
 		emblems/16/in_love.png \
+		emblems/16/mean.png \
 		emblems/16/meeting.png \
 		emblems/16/mobile.png \
 		emblems/16/musical-note.png \
+		emblems/16/neutral.png \
 		emblems/16/party.png \
 		emblems/16/phone.png \
 		emblems/16/plate.png \
 		emblems/16/question.png \
+		emblems/16/sad.png \
+		emblems/16/sarcastic.png \
 		emblems/16/search.png \
 		emblems/16/sick.png \
 		emblems/16/sleeping.png \
diff -r b92ae9c512ec -r 7b2981282c0a pidgin/pixmaps/emotes/small/16/TODO
--- a/pidgin/pixmaps/emotes/small/16/TODO	Mon Nov 17 02:07:30 2008 +0000
+++ b/pidgin/pixmaps/emotes/small/16/TODO	Mon Nov 17 02:30:42 2008 +0000
@@ -1,7 +1,11 @@
 The following icons where just scaled down from the 24x24 and may need work:
+	disappointed.png
+	embarrassed.png
+	mean.png
 	amorous.png
 	meeting.png
 	question.png
+	sarcastic.png
 	search.png
 	sleepy.png
 	smile-big.png
diff -r b92ae9c512ec -r 7b2981282c0a pidgin/pixmaps/emotes/small/16/disappointed.png
Binary file pidgin/pixmaps/emotes/small/16/disappointed.png has changed
diff -r b92ae9c512ec -r 7b2981282c0a pidgin/pixmaps/emotes/small/16/embarrassed.png
Binary file pidgin/pixmaps/emotes/small/16/embarrassed.png has changed
diff -r b92ae9c512ec -r 7b2981282c0a pidgin/pixmaps/emotes/small/16/mean.png
Binary file pidgin/pixmaps/emotes/small/16/mean.png has changed
diff -r b92ae9c512ec -r 7b2981282c0a pidgin/pixmaps/emotes/small/16/sarcastic.png
Binary file pidgin/pixmaps/emotes/small/16/sarcastic.png has changed
diff -r b92ae9c512ec -r 7b2981282c0a pidgin/pixmaps/emotes/small/16/small.theme.in
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in	Mon Nov 17 02:07:30 2008 +0000
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in	Mon Nov 17 02:30:42 2008 +0000
@@ -13,6 +13,7 @@
 tongue.png          :P      :-P     :-p     :p
 shock.png           =-O     =-o
 kiss.png            :-*
+embarrassed.png     :-[
 crying.png          :'(
 thinking.png        :-/     :-\\
 angel.png           O:-)    o:-)
@@ -27,6 +28,7 @@
 shock.png           =-O
 kiss.png            :-*
 excited.png         :-D     :D
+embarrassed.png     :-[
 angel.png           O:-)
 thinking.png        :-\\    :-/
 crying.png          :'(
@@ -40,6 +42,7 @@
 shock.png           :-O     :-o :O :o
 tongue.png          :P      :p :-P :-p
 angry.png           :@      :-@
+embarrassed.png     :$      :-$
 confused.png        :S      :s :-S :-s
 sad.png             :(      :-(
 crying.png          :'(
@@ -55,6 +58,7 @@
 hug-left.png        ({)
 hug-right.png       (})
 beer.png            (B)     (b)
+sarcastic.png       ^o)
 sick.png            +o(
 plate.png           (pl)
 mobile.png          (mp)
@@ -74,6 +78,7 @@
 party.png           /8-)     /dy       /revel
 crying.png          /:<      /ll       /cry
 sleeping.png        /:Z      /shui     /sleep
+embarrassed.png     /:-|     /gg       /embarassed
 excited.png         /:D      /cy       /toothy_smile
 smile.png           /:)      /wx       /small_smile
 sad.png             /:(      /ng       /sad
@@ -105,6 +110,7 @@
 crying.png          :'(    :'-(
 sick.png            :-!
 kiss.png            :-{} :-*
+embarrassed.png     :-[
 devil.png           ]:->
 angel.png           O:-)
 thinking.png        :-\\    :-/
@@ -127,6 +133,8 @@
 angry.png           X-(     x-(     X(      x(
 crying.png          :((
 wink.png            ;)      ;-)
+embarrassed.png     :">
+mean.png            :->     :>
 thinking.png        :-?
 excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
@@ -134,6 +142,7 @@
 sleeping.png        I-)     i-)     |-)
 kiss.png            :-*     :*
 confused.png        :-S     :-s
+sarcastic.png       /:)
 hug-left.png        >:D<    >:d<
 party.png           <:-P    <:-p