cpw.rekkanoryo.icqxstatus: f5c3e22d: Round three of icon renaming. This is p...

rlaager at pidgin.im rlaager at pidgin.im
Mon Nov 17 02:35:33 EST 2008


-----------------------------------------------------------------
Revision: f5c3e22d50e1e2fc7a5d041299c8b910f45501af
Ancestor: 65893f62820c3c5039f62f6b6594b4d2ea5116b8
Author: rlaager at pidgin.im
Date: 2008-11-17T03:06:55
Branch: im.pidgin.cpw.rekkanoryo.icqxstatus
URL: http://d.pidgin.im/viewmtn/revision/info/f5c3e22d50e1e2fc7a5d041299c8b910f45501af

Renamed entries:
        pidgin/pixmaps/emotes/default/24/eat.png to pidgin/pixmaps/emotes/default/24/hungry.png
        pidgin/pixmaps/emotes/default/24/nailbiting.png to pidgin/pixmaps/emotes/default/24/nervous.png
        pidgin/pixmaps/emotes/default/24/shock.png to pidgin/pixmaps/emotes/default/24/shocked.png
        pidgin/pixmaps/emotes/default/24/smile.png to pidgin/pixmaps/emotes/default/24/happy.png
        pidgin/pixmaps/emotes/default/24/sweat.png to pidgin/pixmaps/emotes/default/24/hot.png
        pidgin/pixmaps/emotes/default/24/tremble.png to pidgin/pixmaps/emotes/default/24/afraid.png
Added files:
        pidgin/pixmaps/emotes/small/16/afraid.png
        pidgin/pixmaps/emotes/small/16/happy.png
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/pixmaps/emotes/small/16/hungry.png
        pidgin/pixmaps/emotes/small/16/nervous.png
        pidgin/pixmaps/emotes/small/16/shocked.png
Modified files:
        .mtn-ignore pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/TODO
Modified attrs:
        pidgin/pixmaps/emotes/small/16/afraid.png
        pidgin/pixmaps/emotes/small/16/happy.png
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/pixmaps/emotes/small/16/hungry.png
        pidgin/pixmaps/emotes/small/16/nervous.png
        pidgin/pixmaps/emotes/small/16/shocked.png

ChangeLog: 

Round three of icon renaming.  This is probably all I'm going to do for now.

-------------- next part --------------
============================================================
# pidgin/pixmaps/emotes/small/16/afraid.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/happy.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/hot.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/hungry.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/nervous.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/shocked.png is binary
============================================================
--- .mtn-ignore	363b28898f6cf3a5d9f87fd42fe507d9f62ec933
+++ .mtn-ignore	ddb519533eb14bef18140faeec292d4edc949b9d
@@ -37,6 +37,7 @@ pidgin/pidgin$
 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/excited.png
 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/search.png
 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
============================================================
--- pidgin/pixmaps/emotes/default/24/Makefile.am	e4548df0164301f34850955b3f5c2bcc91a1645a
+++ pidgin/pixmaps/emotes/default/24/Makefile.am	846171e935e629d4ee0f46e52926edede317d863
@@ -57,7 +57,7 @@ SMILEYS = \
     dont-know.png \
     drink.png \
     drool.png \
-    eat.png \
+    hungry.png \
     embarrassed.png \
     excited.png \
     excruciating.png \
@@ -115,7 +115,7 @@ SMILEYS = \
     msn.png \
     musical-note.png \
     music.png \
-    nailbiting.png \
+    nervous.png \
     neutral.png \
     on-the-phone.png \
     party.png \
@@ -145,7 +145,7 @@ SMILEYS = \
     secret.png \
     shame.png \
     sheep.png \
-    shock.png \
+    shocked.png \
     shout.png \
     shut-mouth.png \
     sick.png \
@@ -156,7 +156,7 @@ SMILEYS = \
     skywalker.png \
     sleeping.png \
     sleepy.png \
-    smile.png \
+    happy.png \
     smirk.png \
     snail.png \
     snicker.png \
@@ -168,7 +168,7 @@ SMILEYS = \
     stop.png \
     struggle.png \
     sun.png \
-    sweat.png \
+    hot.png \
     talktohand.png \
     teeth.png \
     terror.png \
@@ -176,7 +176,7 @@ SMILEYS = \
     thunder.png \
     time-out.png \
     tongue.png \
-    tremble.png \
+    afraid.png \
     turtle.png \
     tv.png \
     umbrella.png \
============================================================
--- pidgin/pixmaps/emotes/default/24/default.theme.in	6c99681ad5035c27103faaac80ed5d98c2367673
+++ pidgin/pixmaps/emotes/default/24/default.theme.in	e4dfc0541fe3c7c0f4764b68de56ff5bed1909f6
@@ -6,12 +6,12 @@ Author=Hylke Bons
 
 # 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 @@ shout.png           >:o     >:O
 
 # 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 @@ glasses-cool.png    8-)
 
 # 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 @@ fingers-crossed.png	(yn)    (YN)
 
 # 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 @@ excited.png         /:D      /cy       /
 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 @@ terror.png          /:!      /jk       /
 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 @@ go-away.png         /go      /shan     /
 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 @@ coffee.png          /coffee  /kf       /
 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 @@ boy.png             /<11>    /nan      /
 
 # 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 @@ amorous.png         *IN\ LOVE*
 
 # 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 @@ love-over.png       =((
 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:)
============================================================
--- pidgin/pixmaps/emotes/small/16/TODO	11b94a2fbfc5b6591b98788b926e2c05c1e7e4d2
+++ pidgin/pixmaps/emotes/small/16/TODO	b50c41f639c3114656958ff45ffb3298e45e57e7
@@ -1,12 +1,18 @@ The following icons where just scaled do
 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


More information about the Commits mailing list