summaryrefslogtreecommitdiff
path: root/pidgin/pixmaps/emotes/default/24
diff options
context:
space:
mode:
Diffstat (limited to 'pidgin/pixmaps/emotes/default/24')
-rw-r--r--pidgin/pixmaps/emotes/default/24/Makefile.am20
-rw-r--r--pidgin/pixmaps/emotes/default/24/afraid.png (renamed from pidgin/pixmaps/emotes/default/24/tremble.png)bin1493 -> 1493 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/amorous.png (renamed from pidgin/pixmaps/emotes/default/24/in-love.png)bin1636 -> 1636 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/default.theme.in267
-rw-r--r--pidgin/pixmaps/emotes/default/24/excited.png (renamed from pidgin/pixmaps/emotes/default/24/smile-big.png)bin1420 -> 1420 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/happy.png (renamed from pidgin/pixmaps/emotes/default/24/smile.png)bin1509 -> 1509 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/hot.png (renamed from pidgin/pixmaps/emotes/default/24/sweat.png)bin1513 -> 1513 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/hungry.png (renamed from pidgin/pixmaps/emotes/default/24/eat.png)bin1598 -> 1598 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/in_love.png (renamed from pidgin/pixmaps/emotes/default/24/love.png)bin1339 -> 1339 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/nervous.png (renamed from pidgin/pixmaps/emotes/default/24/nailbiting.png)bin1514 -> 1514 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/shocked.png (renamed from pidgin/pixmaps/emotes/default/24/shock.png)bin1507 -> 1507 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/sleeping.pngbin0 -> 1542 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/sleepy.pngbin1542 -> 1506 bytes
-rw-r--r--pidgin/pixmaps/emotes/default/24/yawn.pngbin1506 -> 0 bytes
14 files changed, 117 insertions, 170 deletions
diff --git a/pidgin/pixmaps/emotes/default/24/Makefile.am b/pidgin/pixmaps/emotes/default/24/Makefile.am
index 4bf3d69044..f4edbe83e6 100644
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am
@@ -2,6 +2,7 @@ SMILEYS = \
act-up.png \
airplane.png \
alien.png \
+ amorous.png \
angel.png \
angry.png \
arrogant.png \
@@ -56,8 +57,9 @@ SMILEYS = \
dont-know.png \
drink.png \
drool.png \
- eat.png \
+ hungry.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 \
@@ -114,7 +115,7 @@ SMILEYS = \
msn.png \
musical-note.png \
music.png \
- nailbiting.png \
+ nervous.png \
neutral.png \
on-the-phone.png \
party.png \
@@ -144,7 +145,7 @@ SMILEYS = \
secret.png \
shame.png \
sheep.png \
- shock.png \
+ shocked.png \
shout.png \
shut-mouth.png \
sick.png \
@@ -153,9 +154,9 @@ SMILEYS = \
sinister.png \
skeleton.png \
skywalker.png \
+ sleeping.png \
sleepy.png \
- smile-big.png \
- smile.png \
+ happy.png \
smirk.png \
snail.png \
snicker.png \
@@ -167,7 +168,7 @@ SMILEYS = \
stop.png \
struggle.png \
sun.png \
- sweat.png \
+ hot.png \
talktohand.png \
teeth.png \
terror.png \
@@ -175,7 +176,7 @@ SMILEYS = \
thunder.png \
time-out.png \
tongue.png \
- tremble.png \
+ afraid.png \
turtle.png \
tv.png \
umbrella.png \
@@ -188,7 +189,6 @@ SMILEYS = \
wilt.png \
wink.png \
worship.png \
- yawn.png \
yin-yang.png
diff --git a/pidgin/pixmaps/emotes/default/24/tremble.png b/pidgin/pixmaps/emotes/default/24/afraid.png
index 623a5d26e3..623a5d26e3 100644
--- a/pidgin/pixmaps/emotes/default/24/tremble.png
+++ b/pidgin/pixmaps/emotes/default/24/afraid.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/in-love.png b/pidgin/pixmaps/emotes/default/24/amorous.png
index e752acc976..e752acc976 100644
--- a/pidgin/pixmaps/emotes/default/24/in-love.png
+++ b/pidgin/pixmaps/emotes/default/24/amorous.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in
index 8ddb77e61d..9fa98b13ba 100644
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -6,37 +6,87 @@ Author=Hylke Bons
# Default smileys
[default]
-smile.png :) :-)
-smile-big.png :-D :-d :D :d
+happy.png :) :-)
+excited.png :-D :-d :D :d
sad.png :-( :(
wink.png ;-) ;)
-tongue.png :P :-P :-p :p
-shock.png =-O =-o
+tongue.png :P :p :-P :-p
+shocked.png =-O =-o
kiss.png :-*
glasses-cool.png 8-)
embarrassed.png :-[
-crying.png :'(
+crying.png :'( :'-(
+thinking.png :-/ :-\\
+angel.png O:-) o:-)
+shut-mouth.png :-X
+moneymouth.png :-$
+foot-in-mouth.png :-!
+shout.png >:o >:O
+! skywalker.png C:-) c:-) C:) c:)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.png O-) o-)
+
+
+[XMPP]
+# Following XEP-0038 + GTalk + our default set, in default set order
+# The GTalk strings come from ticket #3307.
+happy.png :) :-) =)
+excited.png :-D :-d :D :d =D =d
+sad.png :-( :(
+wink.png ;-) ;) ;^)
+tongue.png :P :p :-P :-p
+shocked.png =-O =-o :-O :-o
+kiss.png :kiss: :-*
+glasses-cool.png 8-) B-)
+embarrassed.png :-[
+crying.png :'-( :'(
thinking.png :-/ :-\\
angel.png O:-) o:-)
shut-mouth.png :-X
moneymouth.png :-$
foot-in-mouth.png :-!
shout.png >:o >:O
+
+# Following XEP-0038 + GTalk
+angry.png >:-( >:( X-( x-(
+good.png :yes:
+bad.png :no:
+stop.png :wait:
+rose.png @->-- :rose:
+phone.png :telephone:
+mail.png :email:
+lamp.png :jabber:
+cake.png :cake:
+in_love.png :heart: :love: <3
+love-over.png :brokenheart:
+musical-note.png :music:
+beer.png :beer:
+coffee.png :coffee:
+coins.png :money:
+moon.png :moon:
+sun.png :sun:
+star.png :star:
+
+# Others
+neutral.png :| :-|
+victory.png \\m/
+
+# Hidden icons from the default set.
! skywalker.png C:-) c:-) C:) c:)
-! monkey.png :-(|) :(|) 8-|)
-! cyclops.png O-) o-)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.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
+tongue.png :P :p :-P :-p
+shocked.png =-O
kiss.png :-*
shout.png >:o
-smile-big.png :-D :D
+excited.png :-D :D
moneymouth.png :-$
foot-in-mouth.png :-!
embarrassed.png :-[
@@ -46,26 +96,27 @@ crying.png :'(
shut-mouth.png :-X
glasses-cool.png 8-)
! skywalker.png C:-) c:-) C:) c:)
-! monkey.png :-(|) :(|)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.png O-) o-)
# Following Windows Live Messenger 8.1
[MSN]
-smile.png :) :-)
-smile-big.png :D :d :-D :-d
+happy.png :) :-)
+excited.png :D :d :-D :-d
wink.png ;) ;-)
-shock.png :-O :-o :O :o
-tongue.png :P :p :-P :-p
+shocked.png :-O :-o :O :o
+tongue.png :-P :P :-p :p
glasses-cool.png (H) (h)
angry.png :@ :-@
embarrassed.png :$ :-$
-confused.png :S :s :-S :-s
+confused.png :S :s :-S :-s
sad.png :( :-(
crying.png :'(
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,10 +176,11 @@ thinking.png *-)
thunder.png (li)
party.png <:o)
eyeroll.png 8-)
-yawn.png |-)
+sleepy.png |-)
bunny.png ('.')
! skywalker.png C:-) c:-) C:) c:)
-! monkey.png :-(|) :(|)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.png O-) o-)
# Hidden MSN emotes
cigarette.png (ci) (CI)
@@ -139,7 +191,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
@@ -147,13 +199,13 @@ party.png /8-) /dy /revel
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
-smile.png /:) /wx /small_smile
+excited.png /:D /cy /toothy_smile
+happy.png /:) /wx /small_smile
sad.png /:( /ng /sad
glasses-cool.png /:+ /kuk /cool
doctor.png /:# /feid /SARS
@@ -164,9 +216,9 @@ cute.png /;-D /ka /cute
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
+hot.png /:L /sweat
smirk.png /:> /hanx /smirk
soldier.png /:; /db /soldier
struggle.png /;f /fendou /struggle
@@ -180,8 +232,8 @@ skeleton.png /!!! /kl /skeleton
hammer.png /xx /qiao /hammer
bye.png /bye /zj /bye
go-away.png /go /shan /go
-tremble.png /shake /fad /shake
-in-love.png /love /aiq /love
+afraid.png /shake /fad /shake
+amorous.png /love /aiq /love
jump.png /jump /tiao /jump
search.png /find /zhao /search
lashes.png /& /mm /beautiful_eyebrows
@@ -200,12 +252,12 @@ soccerball.png /footb /zq /soccer
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
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
@@ -233,20 +285,21 @@ star.png /<*> /xixing /star
girl.png /<00> /nv /woman
boy.png /<11> /nan /man
! skywalker.png C:-) c:-) C:) c:)
-! monkey.png :-(|) :(|)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.png O-) o-)
# 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 [:-}
laugh.png *JOKINGLY*
-sleepy.png *TIRED*
+sleeping.png *TIRED*
crying.png :'( :'-(
sick.png :-!
kissed.png *KISSED*
@@ -265,26 +318,27 @@ thinking.png :-\\ :-/
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 :-(|) :(|)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.png O-) o-)
# 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 :-&
-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 +355,11 @@ arrogant.png [-(
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 :-<
@@ -321,107 +375,16 @@ mad-tongue.png >:P >:p
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:)
-! monkey.png :-(|) :(|)
-
-# Hidden Yahoo emotes
-alien.png =:) >-)
-beat-up.png b-( B-(
-chicken.png ~:>
-coffee.png ~o) ~O)
-cow.png 3:-O 3:-o
-dance.png \\:D/ \\:d/
-rose.png @};-
-dont-know.png :-L :-l
-skeleton.png 8-X 8-x
-lamp.png *-:)
-monkey.png :(|)
-coins.png $-)
-peace.png :)>-
-pig.png :@)
-pray.png [-o< [-O<
-pumpkin.png (~~)
-shame.png [-X [-x
-flag.png **==
-clover.png %%-
-musical-note.png :-"
-giggle.png ;))
-worship.png ^:)^
-star.png (*)
-waving.png >:/
-talktohand.png :-@
-
-# Only available after activating the Yahoo! Fighter IMVironment
-male-fighter1.png o-> O->
-male-fighter2.png o=> O=>
-female-fighter.png o-+ O-+
-yin-yang.png (%)
-
-# Following Yahoo! Messenger 8.1
-[Yahoo JAPAN]
-smile.png :) :-)
-question.png :-/ :-\\
-shock.png :-O :O :-o :o
-devil.png >:)
-angel.png O:-) o:-) 0:-)
-sick.png :-&
-yawn.png (:|
-hypnotized.png @-)
-on-the-phone.png :)]
-sad.png :( :-(
-in-love.png :x :-x :X :-X
-angry.png X-( x-( X( x(
-crying.png :((
-glasses-nerdy.png :-B :-b
-quiet.png :-$
-drool.png =P~ =p~
-lying.png :^O :^o
-call-me.png :-c
-wink.png ;) ;-)
-embarrassed.png :">
-mean.png :-> :>
-laugh.png :)) :-))
-bye.png =;
-arrogant.png [-(
-thinking.png :-?
-waiting.png :-w :-W
-at-wits-end.png ~x( ~X(
-smile-big.png :D :-D :d :-d
-tongue.png :-P :P :-p :p
-glasses-cool.png B-) b-)
-neutral.png :| :-|
-sleepy.png I-) i-) |-)
-clown.png :o) :O)
-doh.png #-o #-O
-weep.png :-<
-go-away.png :-h
-lashes.png ;;)
-kiss.png :-* :*
-confused.png :-S :-s
-sarcastic.png /:)
-eyeroll.png 8-|
-silly.png 8-}
-clap.png =D> =d>
-mad-tongue.png >:P >:p
-time-out.png :-t :-T
-hug-left.png >:D< >:d<
-love-over.png =((
-sweat.png #:-S #:-s
-rotfl.png =)) :-j :-J
-loser.png L-) l-)
-party.png <:-P <:-p
-nailbiting.png :-SS :-Ss :-sS :-ss
-cowboy.png <):)
-desire.png 8->
-! skywalker.png C:-) c:-) C:) c:)
-! monkey.png :-(|) :(|)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.png O-) o-)
# Hidden Yahoo emotes
alien.png =:) >-)
@@ -459,14 +422,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(
@@ -474,7 +437,7 @@ messed.png X)
glasses-nerdy.png Q)
doh.png :G
pirate.png P)
-shock.png :O
+shocked.png :O
sidefrown.png :{
sinister.png :B
smirk.png :,
@@ -484,23 +447,7 @@ pissed-off.png B|
wink.png ;-) ;)
sad.png :[
kiss.png :x
-
-[XMPP]
-# XMPP emoticons
-smile.png :) :-) =)
-smile-big.png :D :-D =D
-wink.png ;) ;-) ;^)
-shock.png :-o
-tongue.png :P :-P :-p :p
-glasses-cool.png B-)
-angry.png X-(
-sad.png :( :-( =(
-crying.png :'(
-neutral.png :-|
-thinking.png :-/
-love.png <3
-monkey.png :(|)
-victory.png \\m/
! skywalker.png C:-) c:-) C:) c:)
-! monkey.png :-(|) :(|) 8-|)
-! cyclops.png O-) o-)
+! monkey.png :-(|) :(|) 8-|)
+! cyclops.png O-) o-)
+
diff --git a/pidgin/pixmaps/emotes/default/24/smile-big.png b/pidgin/pixmaps/emotes/default/24/excited.png
index ce3f8664bc..ce3f8664bc 100644
--- a/pidgin/pixmaps/emotes/default/24/smile-big.png
+++ b/pidgin/pixmaps/emotes/default/24/excited.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/smile.png b/pidgin/pixmaps/emotes/default/24/happy.png
index 8a2ba4925c..8a2ba4925c 100644
--- a/pidgin/pixmaps/emotes/default/24/smile.png
+++ b/pidgin/pixmaps/emotes/default/24/happy.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/sweat.png b/pidgin/pixmaps/emotes/default/24/hot.png
index 1b7fbec14b..1b7fbec14b 100644
--- a/pidgin/pixmaps/emotes/default/24/sweat.png
+++ b/pidgin/pixmaps/emotes/default/24/hot.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/eat.png b/pidgin/pixmaps/emotes/default/24/hungry.png
index 393482f13e..393482f13e 100644
--- a/pidgin/pixmaps/emotes/default/24/eat.png
+++ b/pidgin/pixmaps/emotes/default/24/hungry.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/love.png b/pidgin/pixmaps/emotes/default/24/in_love.png
index 31aeea275e..31aeea275e 100644
--- a/pidgin/pixmaps/emotes/default/24/love.png
+++ b/pidgin/pixmaps/emotes/default/24/in_love.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/nailbiting.png b/pidgin/pixmaps/emotes/default/24/nervous.png
index 6888af8e0a..6888af8e0a 100644
--- a/pidgin/pixmaps/emotes/default/24/nailbiting.png
+++ b/pidgin/pixmaps/emotes/default/24/nervous.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/shock.png b/pidgin/pixmaps/emotes/default/24/shocked.png
index 0e7438e9ee..0e7438e9ee 100644
--- a/pidgin/pixmaps/emotes/default/24/shock.png
+++ b/pidgin/pixmaps/emotes/default/24/shocked.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/sleeping.png b/pidgin/pixmaps/emotes/default/24/sleeping.png
new file mode 100644
index 0000000000..e3bfe411b1
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/sleeping.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/sleepy.png b/pidgin/pixmaps/emotes/default/24/sleepy.png
index e3bfe411b1..2c3e78fd8d 100644
--- a/pidgin/pixmaps/emotes/default/24/sleepy.png
+++ b/pidgin/pixmaps/emotes/default/24/sleepy.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/default/24/yawn.png b/pidgin/pixmaps/emotes/default/24/yawn.png
deleted file mode 100644
index 2c3e78fd8d..0000000000
--- a/pidgin/pixmaps/emotes/default/24/yawn.png
+++ /dev/null
Binary files differ
View Lorry Controller Status