/pidgin/main: f55a5555ee46: Merge
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Fri Nov 16 12:34:06 EST 2012
Changeset: f55a5555ee46e55d1d1273a6a6fc9fc6d6392f20
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2012-11-16 18:33 +0100
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/f55a5555ee46
Description:
Merge
diffstat:
pidgin/pixmaps/emotes/default/24/default.theme.in | 100 ----------------------
pidgin/pixmaps/emotes/small/16/Makefile.am | 2 +
pidgin/pixmaps/emotes/small/16/small.theme.in | 38 --------
3 files changed, 2 insertions(+), 138 deletions(-)
diffs (177 lines):
diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -189,106 +189,6 @@ console.png (xx) (XX)
fingers-crossed.png (yn) (YN)
-# Following QQ 2006
-[QQ]
-shocked.png /:O /jy /surprised
-curl-lip.png /:~ /pz /curl_lip
-desire.png /:* /se /desire
-dazed.png /:| /dazed
-party.png /8-) /dy /revel
-crying.png /:< /ll /cry
-bashful.png /:$ /hx /bashful
-shut-mouth.png /:X /bz /shut_mouth
-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
-excited.png /:D /cy /toothy_smile
-happy.png /:) /wx /small_smile
-sad.png /:( /ng /sad
-glasses-cool.png /:+ /kuk /cool
-doctor.png /:# /feid /SARS
-silly.png /:Q /zk /crazy
-sick.png /:T /tu /vomit
-snicker.png /;p /tx /titter
-cute.png /;-D /ka /cute
-disdain.png /;d /by /disdain
-arrogant.png /;o /am /arrogant
-starving.png /:g /jie /starving
-sleepy.png /|-) /kun /sleepy
-terror.png /:! /jk /terror
-hot.png /:L /sweat
-smirk.png /:> /hanx /smirk
-soldier.png /:; /db /soldier
-struggle.png /;f /fendou /struggle
-curse.png /:-S /zhm /curse
-question.png /? /yiw /question
-quiet.png /;x /xu /shh
-hypnotized.png /;@ /yun /dizzy
-excruciating.png /:8 /zhem /excrutiating
-freaked-out.png /;! /shuai /freaked_out
-skeleton.png /!!! /kl /skeleton
-hammer.png /xx /qiao /hammer
-bye.png /bye /zj /bye
-go-away.png /go /shan /go
-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
-pig.png /pig /zt /pig
-cat.png /cat /mm /cat
-dog.png /dog /xg /dog
-hug-left.png /hug /yb /hug
-coins.png /$ /qianc /money
-lamp.png /! /dp /lightbulb
-bowl.png /cup /bei /cup
-cake.png /cake /dg /cake
-thunder.png /li /shd /lightning
-bomb.png /bome /zhd /bomb
-knife.png /kn /dao /knife
-soccerball.png /footb /zq /soccer
-musical-note.png /music /yy /music
-poop.png /shit /bb /shit
-coffee.png /coffee /kf /coffee
-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
-in_love.png /heart /xin /heart
-love-over.png /break /xs /broken_heart
-meeting.png /meeting /hy /meeting
-present.png /gift /lw /gift
-phone.png /phone /dh /phone
-clock.png /time /sj /time
-mail.png /email /yj /email
-tv.png /TV /ds /TV
-sun.png /sun /ty /sun
-moon.png /moon /yl /moon
-good.png /strong /qiang /thumbs_up
-bad.png /weak /ruo /thumbs_down
-handshake.png /share /ws /handshake
-victory.png /v /shl /victory
-beauty.png /<J> /mn /beauty
-qq.png /<QQ> /qz /qq
-blowkiss.png /<L> /fw /blow_kiss
-angry.png /<O> /oh /angry
-liquor.png /<B> /bj /baijiu
-can.png /<U> /qsh /soda
-watermelon.png /<W> /xigua /watermelon
-rain.png /<!!> /xy /rain
-cloudy.png /<~> /duoy /cloudy
-snowman.png /<Z> /xr /snowman
-star.png /<*> /xixing /star
-girl.png /<00> /nv /woman
-boy.png /<11> /nan /man
-! skywalker.png C:-) c:-) C:) c:)
-! monkey.png :-(|) :(|) 8-|)
-! cyclops.png O-) o-)
-
-
# Following ICQ 6.0
[ICQ]
happy.png :-) :)
diff --git a/pidgin/pixmaps/emotes/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am
@@ -43,6 +43,7 @@ SMILEYS = \
excruciating.png \
eyeroll.png \
girl.png \
+ glasses-cool.png \
happy.png \
hug-left.png \
hug-right.png \
@@ -65,6 +66,7 @@ SMILEYS = \
question.png \
rose.png \
sad.png \
+ sarcastic.png \
shame.png \
shocked.png \
shut-mouth.png \
diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in
@@ -118,44 +118,6 @@ cigarette.png (ci) (CI)
console.png (xx) (XX)
-# Following QQ 2006
-[QQ]
-shocked.png /:O /jy /surprised
-party.png /8-) /dy /revel
-crying.png /:< /ll /cry
-shut-mouth.png /:X /bz /shut_mouth
-sleeping.png /:Z /shui /sleep
-embarrassed.png /:-| /gg /embarassed
-pissed-off.png /:@ /fn /pissed_off
-excited.png /:D /cy /toothy_smile
-happy.png /:) /wx /small_smile
-sad.png /:( /ng /sad
-glasses-cool.png /:+ /kuk /cool
-sick.png /:T /tu /vomit
-sleepy.png /|-) /kun /sleepy
-hot.png /:L /sweat
-question.png /? /yiw /question
-excruciating.png /:8 /zhem /excrutiating
-afraid.png /shake /fad /shake
-amorous.png /love /aiq /love
-search.png /find /zhao /search
-hug-left.png /hug /yb /hug
-lamp.png /! /dp /lightbulb
-thunder.png /li /shd /lightning
-musical-note.png /music /yy /music
-coffee.png /coffee /kf /coffee
-hungry.png /eat /fan /eat
-rose.png /rose /mg /rose
-kiss.png /kiss /wen /kiss
-in_love.png /heart /xin /heart
-meeting.png /meeting /hy /meeting
-phone.png /phone /dh /phone
-tv.png /TV /ds /TV
-angry.png /<O> /oh /angry
-girl.png /<00> /nv /woman
-boy.png /<11> /nan /man
-
-
# Following ICQ 6.0
[ICQ]
happy.png :-) :)
More information about the Commits
mailing list