cpw.rekkanoryo.icqxstatus: 7be80e60: The first round of renaming icons to mat...
rlaager at pidgin.im
rlaager at pidgin.im
Mon Nov 17 02:35:26 EST 2008
-----------------------------------------------------------------
Revision: 7be80e6000adce2d92f47ea2bd85bdd6b452a35a
Ancestor: fde77076b7eb2398e6f25db21ff4ac902e9dae5a
Author: rlaager at pidgin.im
Date: 2008-11-17T02:07:30
Branch: im.pidgin.cpw.rekkanoryo.icqxstatus
URL: http://d.pidgin.im/viewmtn/revision/info/7be80e6000adce2d92f47ea2bd85bdd6b452a35a
Renamed entries:
pidgin/pixmaps/emotes/default/24/in-love.png to pidgin/pixmaps/emotes/default/24/amorous.png
pidgin/pixmaps/emotes/default/24/love.png to pidgin/pixmaps/emotes/default/24/in_love.png
pidgin/pixmaps/emotes/default/24/sleepy.png to pidgin/pixmaps/emotes/default/24/sleeping.png
pidgin/pixmaps/emotes/default/24/smile-big.png to pidgin/pixmaps/emotes/default/24/excited.png
pidgin/pixmaps/emotes/default/24/yawn.png to pidgin/pixmaps/emotes/default/24/sleepy.png
pidgin/pixmaps/emotes/small/16/love.png to pidgin/pixmaps/emotes/small/16/in_love.png
pidgin/pixmaps/emotes/small/16/sleepy.png to pidgin/pixmaps/emotes/small/16/sleeping.png
pidgin/pixmaps/emotes/small/16/smile-big.png to pidgin/pixmaps/emotes/small/16/excited.png
pidgin/pixmaps/emotes/small/16/yawn.png to pidgin/pixmaps/emotes/small/16/sleepy.png
Added files:
pidgin/pixmaps/emotes/small/16/amorous.png
Modified files:
.mtn-ignore libpurple/protocols/oscar/family_locate.c
pidgin/pixmaps/Makefile.am
pidgin/pixmaps/emotes/default/24/Makefile.am
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/pixmaps/emotes/small/16/Makefile.am
pidgin/pixmaps/emotes/small/16/TODO
pidgin/pixmaps/emotes/small/16/small.theme.in
Modified attrs:
pidgin/pixmaps/emotes/small/16/amorous.png
ChangeLog:
The first round of renaming icons to match the XEP-0107 names.
-------------- next part --------------
============================================================
# pidgin/pixmaps/emotes/small/16/amorous.png is binary
============================================================
--- .mtn-ignore 0aba084458555394bc62ed9f395f62b36266c65a
+++ .mtn-ignore 9c03e2eff8cf57aebcc78604654580718fbfab89
@@ -37,13 +37,15 @@ pidgin/pidgin$
pidgin-.*.tar.bz2
pidgin-*.*.*-win32bin$
pidgin/pidgin$
+pidgin/pixmaps/emblems/16/amorous.png
pidgin/pixmaps/emblems/16/angry.png
pidgin/pixmaps/emblems/16/beer.png
pidgin/pixmaps/emblems/16/busy.png
pidgin/pixmaps/emblems/16/cigarette.png
pidgin/pixmaps/emblems/16/coffee.png
pidgin/pixmaps/emblems/16/console.png
-pidgin/pixmaps/emblems/16/love.png
+pidgin/pixmaps/emblems/16/excited.png
+pidgin/pixmaps/emblems/16/in_love.png
pidgin/pixmaps/emblems/16/meeting.png
pidgin/pixmaps/emblems/16/mobile.png
pidgin/pixmaps/emblems/16/musical-note.png
@@ -53,11 +55,10 @@ pidgin/pixmaps/emblems/16/sick.png
pidgin/pixmaps/emblems/16/question.png
pidgin/pixmaps/emblems/16/search.png
pidgin/pixmaps/emblems/16/sick.png
+pidgin/pixmaps/emblems/16/sleeping.png
pidgin/pixmaps/emblems/16/sleepy.png
-pidgin/pixmaps/emblems/16/smile-big.png
pidgin/pixmaps/emblems/16/thinking.png
pidgin/pixmaps/emblems/16/tv.png
-pidgin/pixmaps/emblems/16/yawn.png
pidgin/pixmaps/emotes/default/24/theme
pidgin/pixmaps/emotes/none/theme
pidgin/pixmaps/emotes/small/16/theme
============================================================
--- libpurple/protocols/oscar/family_locate.c e24c1817d52e3c44509894713a1bada5f1424313
+++ libpurple/protocols/oscar/family_locate.c 50a94dc6c27c934a4eab1623489a32079936d10e
@@ -316,11 +316,11 @@ static const struct {
{0x80, 0x53, 0x7d, 0xe2, 0xa4, 0x67, 0x4a, 0x76,
0xb3, 0x54, 0x6d, 0xfd, 0x07, 0x5f, 0x5e, 0xc6}},
- {"smile-big", N_("Having fun"),
+ {"excited", N_("Having fun"),
{0x6f, 0x49, 0x30, 0x98, 0x4f, 0x7c, 0x4a, 0xff,
0xa2, 0x76, 0x34, 0xa0, 0x3b, 0xce, 0xae, 0xa7}},
- {"sleepy", N_("Sleeping"),
+ {"sleeping", N_("Sleeping"),
{0x78, 0x5e, 0x8c, 0x48, 0x40, 0xd3, 0x4c, 0x65,
0x88, 0x6f, 0x04, 0xcf, 0x3f, 0x3f, 0x43, 0xdf}},
@@ -328,12 +328,12 @@ static const struct {
{0x10, 0x11, 0x17, 0xc9, 0xa3, 0xb0, 0x40, 0xf9,
0x81, 0xac, 0x49, 0xe1, 0x59, 0xfb, 0xd5, 0xd4}},
- {"love", N_("In love"),
+ {"in_love", N_("In love"),
{0xdd, 0xcf, 0x0e, 0xa9, 0x71, 0x95, 0x40, 0x48,
0xa9, 0xc6, 0x41, 0x32, 0x06, 0xd6, 0xf2, 0x80}},
/* Sleepy / Tired */
- {"yawn", N_("Sleepy"),
+ {"sleepy", N_("Sleepy"),
{0x83, 0xc9, 0xb7, 0x8e, 0x77, 0xe7, 0x43, 0x78,
0xb2, 0xc5, 0xfb, 0x6c, 0xfc, 0xc3, 0x5b, 0xec}},
@@ -761,7 +761,7 @@ static const struct {
} icqmoods[] = {
{"icqmood0", "shopping"},
{"icqmood1", "bathing"},
- {"icqmood2", "yawn"},
+ {"icqmood2", "sleepy"},
{"icqmood3", "party"},
{"icqmood4", "beer"},
{"icqmood5", "thinking"},
@@ -777,7 +777,7 @@ static const struct {
{"icqmood15", "console"},
{"icqmood16", "studying"},
{"icqmood17", "sick"},
- {"icqmood18", "sleepy"},
+ {"icqmood18", "sleeping"},
{"icqmood19", "surfing"},
{"icqmood20", "internet"},
{"icqmood21", "working"},
============================================================
--- pidgin/pixmaps/Makefile.am c3c19d53c5d4eed2c5d73ae52260274444d2281e
+++ pidgin/pixmaps/Makefile.am c2be8966d871afeaa47080c38169f784e7d0e2d7
@@ -122,13 +122,15 @@ EMBLEMS_16_COPIED = \
# The copied emblems.
# Ensure these are in .mtn-ignore.
EMBLEMS_16_COPIED = \
+ emblems/16/amorous.png \
emblems/16/angry.png \
emblems/16/busy.png \
emblems/16/beer.png \
emblems/16/cigarette.png \
emblems/16/coffee.png \
emblems/16/console.png \
- emblems/16/love.png \
+ emblems/16/excited.png \
+ emblems/16/in_love.png \
emblems/16/meeting.png \
emblems/16/mobile.png \
emblems/16/musical-note.png \
@@ -138,11 +140,10 @@ EMBLEMS_16_COPIED = \
emblems/16/question.png \
emblems/16/search.png \
emblems/16/sick.png \
+ emblems/16/sleeping.png \
emblems/16/sleepy.png \
- emblems/16/smile-big.png \
emblems/16/thinking.png \
- emblems/16/tv.png \
- emblems/16/yawn.png
+ emblems/16/tv.png
# Non-copied emblems.
============================================================
--- pidgin/pixmaps/emotes/default/24/Makefile.am 678ec78a9852d0af96ee992cba7b3051d86b3d11
+++ pidgin/pixmaps/emotes/default/24/Makefile.am e4548df0164301f34850955b3f5c2bcc91a1645a
@@ -2,6 +2,7 @@ SMILEYS = \
act-up.png \
airplane.png \
alien.png \
+ amorous.png \
angel.png \
angry.png \
arrogant.png \
@@ -58,6 +59,7 @@ SMILEYS = \
drool.png \
eat.png \
embarrassed.png \
+ excited.png \
excruciating.png \
eyeroll.png \
female-fighter.png \
@@ -81,7 +83,7 @@ SMILEYS = \
hug-left.png \
hug-right.png \
hypnotized.png \
- in-love.png \
+ in_love.png \
island.png \
jump.png \
kissed.png \
@@ -94,7 +96,6 @@ SMILEYS = \
liquor.png \
loser.png \
love-over.png \
- love.png \
lying.png \
mad-tongue.png \
mail.png \
@@ -153,8 +154,8 @@ SMILEYS = \
sinister.png \
skeleton.png \
skywalker.png \
+ sleeping.png \
sleepy.png \
- smile-big.png \
smile.png \
smirk.png \
snail.png \
@@ -188,7 +189,6 @@ SMILEYS = \
wilt.png \
wink.png \
worship.png \
- yawn.png \
yin-yang.png
============================================================
--- pidgin/pixmaps/emotes/default/24/default.theme.in 0c8daec0f6895bd90b5fff301cc90a066121e8af
+++ pidgin/pixmaps/emotes/default/24/default.theme.in 6c99681ad5035c27103faaac80ed5d98c2367673
@@ -7,7 +7,7 @@ smile.png :) :-)
# Default smileys
[default]
smile.png :) :-)
-smile-big.png :-D :-d :D :d
+excited.png :-D :-d :D :d
sad.png :-( :(
wink.png ;-) ;)
tongue.png :P :-P :-p :p
@@ -36,7 +36,7 @@ shout.png >:o
shock.png =-O
kiss.png :-*
shout.png >:o
-smile-big.png :-D :D
+excited.png :-D :D
moneymouth.png :-$
foot-in-mouth.png :-!
embarrassed.png :-[
@@ -52,7 +52,7 @@ smile.png :) :-)
# Following Windows Live Messenger 8.1
[MSN]
smile.png :) :-)
-smile-big.png :D :d :-D :-d
+excited.png :D :d :-D :-d
wink.png ;) ;-)
shock.png :-O :-o :O :o
tongue.png :P :p :-P :-p
@@ -65,7 +65,7 @@ angel.png (A) (a)
neutral.png :| :-|
devil.png (6)
angel.png (A) (a)
-love.png (L) (l)
+in_love.png (L) (l)
love-over.png (U) (u)
msn.png (M) (m)
cat.png (@)
@@ -125,7 +125,7 @@ eyeroll.png 8-)
thunder.png (li)
party.png <:o)
eyeroll.png 8-)
-yawn.png |-)
+sleepy.png |-)
bunny.png ('.')
! skywalker.png C:-) c:-) C:) c:)
! monkey.png :-(|) :(|)
@@ -147,12 +147,12 @@ shut-mouth.png /:X /bz /
crying.png /:< /ll /cry
bashful.png /:$ /hx /bashful
shut-mouth.png /:X /bz /shut_mouth
-sleepy.png /:Z /shui /sleep
+sleeping.png /:Z /shui /sleep
weep.png /:'( /dk /weep
embarrassed.png /:-| /gg /embarassed
pissed-off.png /:@ /fn /pissed_off
act-up.png /:P /tp /act_up
-smile-big.png /:D /cy /toothy_smile
+excited.png /:D /cy /toothy_smile
smile.png /:) /wx /small_smile
sad.png /:( /ng /sad
glasses-cool.png /:+ /kuk /cool
@@ -164,7 +164,7 @@ starving.png /:g /jie /
disdain.png /;d /by /disdain
arrogant.png /;o /am /arrogant
starving.png /:g /jie /starving
-yawn.png /|-) /kun /sleepy
+sleepy.png /|-) /kun /sleepy
terror.png /:! /jk /terror
sweat.png /:L /sweat
smirk.png /:> /hanx /smirk
@@ -181,7 +181,7 @@ tremble.png /shake /fad /
bye.png /bye /zj /bye
go-away.png /go /shan /go
tremble.png /shake /fad /shake
-in-love.png /love /aiq /love
+amorous.png /love /aiq /love
jump.png /jump /tiao /jump
search.png /find /zhao /search
lashes.png /& /mm /beautiful_eyebrows
@@ -205,7 +205,7 @@ kiss.png /kiss /wen /
rose.png /rose /mg /rose
wilt.png /fade /dx /wilt
kiss.png /kiss /wen /kiss
-love.png /heart /xin /heart
+in_love.png /heart /xin /heart
love-over.png /break /xs /broken_heart
meeting.png /meeting /hy /meeting
present.png /gift /lw /gift
@@ -246,7 +246,7 @@ laugh.png *JOKINGLY*
tongue.png :-P :P :-p :p
music.png [:-}
laugh.png *JOKINGLY*
-sleepy.png *TIRED*
+sleeping.png *TIRED*
crying.png :'( :'-(
sick.png :-!
kissed.png *KISSED*
@@ -265,9 +265,9 @@ beer.png *DRINK*
good.png *THUMBS\ UP*
shout.png >:o >:O :-@
beer.png *DRINK*
-smile-big.png :-D :D
+excited.png :-D :D
glasses-cool.png 8-)
-in-love.png *IN\ LOVE*
+amorous.png *IN\ LOVE*
! skywalker.png C:-) c:-) C:) c:)
! monkey.png :-(|) :(|)
@@ -280,11 +280,11 @@ sick.png :-&
devil.png >:)
angel.png O:-) o:-) 0:-)
sick.png :-&
-yawn.png (:|
+sleepy.png (:|
hypnotized.png @-)
on-the-phone.png :)]
sad.png :( :-(
-in-love.png :x :-x :X :-X
+amorous.png :x :-x :X :-X
angry.png X-( x-( X( x(
crying.png :((
glasses-nerdy.png :-B :-b
@@ -301,11 +301,11 @@ at-wits-end.png ~x( ~X(
thinking.png :-?
waiting.png :-w :-W
at-wits-end.png ~x( ~X(
-smile-big.png :D :-D :d :-d
+excited.png :D :-D :d :-d
tongue.png :-P :P :-p :p
glasses-cool.png B-) b-)
neutral.png :| :-|
-sleepy.png I-) i-) |-)
+sleeping.png I-) i-) |-)
clown.png :o) :O)
doh.png #-o #-O
weep.png :-<
@@ -367,14 +367,14 @@ yin-yang.png (%)
# Following MySpaceIM Beta 1.0.697.0
[MySpaceIM]
-smile-big.png :D :-D
+excited.png :D :-D
devil.png }:)
confused.png :Z
glasses-nerdy.png B)
bulgy-eyes.png %)
freaked-out.png :E
smile.png :) :-)
-in-love.png :X
+amorous.png :X
laugh.png :))
mohawk.png -:
mad-tongue.png X(
============================================================
--- pidgin/pixmaps/emotes/small/16/Makefile.am ef3867ee0cc77677d4c9849df49ec5e35e419bd1
+++ pidgin/pixmaps/emotes/small/16/Makefile.am 3fdbe376b91d7101736080f260061db8d1236c86
@@ -1,4 +1,5 @@ SMILEYS = \
SMILEYS = \
+ amorous.png \
angel.png \
angry.png \
beer.png \
@@ -12,11 +13,12 @@ SMILEYS = \
crying.png \
devil.png \
dont-know.png \
+ excited.png \
grin.png \
hug-left.png \
hug-right.png \
+ in_love.png \
kiss.png \
- love.png \
meeting.png \
mobile.png \
musical-note.png \
@@ -31,15 +33,14 @@ SMILEYS = \
shock.png \
sick.png \
silent.png \
+ sleeping.png \
sleepy.png \
- smile-big.png \
smile.png \
thinking.png \
tongue.png \
tv.png \
uhm-yeah.png \
- wink.png \
- yawn.png
+ wink.png
pidginsmileypix_in_files = small.theme.in
============================================================
--- pidgin/pixmaps/emotes/small/16/TODO 1a4d04596e181a84885cbbf17606bb92fdb77b03
+++ pidgin/pixmaps/emotes/small/16/TODO ae1e3f223ef5d60c98d52ffb88d8f572d4c9785d
@@ -1,4 +1,5 @@ The following icons where just scaled do
The following icons where just scaled down from the 24x24 and may need work:
+ amorous.png
meeting.png
question.png
search.png
@@ -13,7 +14,7 @@ our default icons:
cigarette.png
coffee.png
console.png
- love.png
+ in_love.png
musical-note.png
party.png
phone.png
============================================================
--- pidgin/pixmaps/emotes/small/16/small.theme.in 8a938e2e7333512801c2a2e771959f0522776475
+++ pidgin/pixmaps/emotes/small/16/small.theme.in 54b8ea9a8ecb74bfa00e1b3bbd39efe19ec423b2
@@ -7,7 +7,7 @@ smile.png :) :-)
# Default smileys
[default]
smile.png :) :-)
-smile-big.png :-D :-d :D :d
+excited.png :-D :-d :D :d
sad.png :-( :(
wink.png ;-) ;)
tongue.png :P :-P :-p :p
@@ -26,7 +26,7 @@ kiss.png :-*
tongue.png :-P :P :-p :p
shock.png =-O
kiss.png :-*
-smile-big.png :-D :D
+excited.png :-D :D
angel.png O:-)
thinking.png :-\\ :-/
crying.png :'(
@@ -35,7 +35,7 @@ smile.png :) :-)
# Following Windows Live Messenger 8.1
[MSN]
smile.png :) :-)
-smile-big.png :D :d :-D :-d
+excited.png :D :d :-D :-d
wink.png ;) ;-)
shock.png :-O :-o :O :o
tongue.png :P :p :-P :-p
@@ -46,7 +46,7 @@ angel.png (A) (a)
neutral.png :| :-|
devil.png (6)
angel.png (A) (a)
-love.png (L) (l)
+in_love.png (L) (l)
musical-note.png (8)
kiss.png (K) (k)
camera.png (P) (p)
@@ -61,7 +61,7 @@ party.png <:o)
dont-know.png :^)
thinking.png *-)
party.png <:o)
-yawn.png |-)
+sleepy.png |-)
# Hidden MSN emotes
cigarette.png (ci) (CI)
@@ -73,19 +73,20 @@ crying.png /:< /ll /
shock.png /:O /jy /surprised
party.png /8-) /dy /revel
crying.png /:< /ll /cry
-sleepy.png /:Z /shui /sleep
-smile-big.png /:D /cy /toothy_smile
+sleeping.png /:Z /shui /sleep
+excited.png /:D /cy /toothy_smile
smile.png /:) /wx /small_smile
sad.png /:( /ng /sad
sick.png /:T /tu /vomit
-yawn.png /|-) /kun /sleepy
+sleepy.png /|-) /kun /sleepy
question.png /? /yiw /question
+amorous.png /love /aiq /love
search.png /find /zhao /search
hug-left.png /hug /yb /hug
musical-note.png /music /yy /music
coffee.png /coffee /kf /coffee
kiss.png /kiss /wen /kiss
-love.png /heart /xin /heart
+in_love.png /heart /xin /heart
meeting.png /meeting /hy /meeting
phone.png /phone /dh /phone
tv.png /TV /ds /TV
@@ -100,7 +101,7 @@ tongue.png :-P :P :-p
shock.png =-O
wink.png ;-) ;)
tongue.png :-P :P :-p :p
-sleepy.png *TIRED*
+sleeping.png *TIRED*
crying.png :'( :'-(
sick.png :-!
kiss.png :-{} :-*
@@ -108,7 +109,8 @@ beer.png *DRINK*
angel.png O:-)
thinking.png :-\\ :-/
beer.png *DRINK*
-smile-big.png :-D :D
+excited.png :-D :D
+amorous.png *IN\ LOVE*
# Following Yahoo! Messenger 8.1
@@ -119,16 +121,17 @@ sick.png :-&
devil.png >:)
angel.png O:-) o:-) 0:-)
sick.png :-&
-yawn.png (:|
+sleepy.png (:|
sad.png :( :-(
+amorous.png :x :-x :X :-X
angry.png X-( x-( X( x(
crying.png :((
wink.png ;) ;-)
thinking.png :-?
-smile-big.png :D :-D :d :-d
+excited.png :D :-D :d :-d
tongue.png :-P :P :-p :p
neutral.png :| :-|
-sleepy.png I-) i-) |-)
+sleeping.png I-) i-) |-)
kiss.png :-* :*
confused.png :-S :-s
hug-left.png >:D< >:d<
@@ -145,10 +148,11 @@ musical-note.png :-"
# Following MySpaceIM Beta 1.0.697.0
[MySpaceIM]
-smile-big.png :D :-D
+excited.png :D :-D
devil.png }:)
confused.png :Z
smile.png :) :-)
+amorous.png :X
shock.png :O
neutral.png :|
tongue.png :P :p
More information about the Commits
mailing list