pidgin.mxit: 42ccfa6e: Add 16x16 emoticon set for MXit.

andrew.victor at mxit.com andrew.victor at mxit.com
Thu Jul 29 05:32:09 EDT 2010


----------------------------------------------------------------------
Revision: 42ccfa6e4bc97f62d512937d3548a253f44659a4
Parent:   10ee9bf6c559ffd9edb93b5ce81dd4ab07d5c5bf
Author:   andrew.victor at mxit.com
Date:     07/29/10 05:27:24
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/42ccfa6e4bc97f62d512937d3548a253f44659a4

Changelog: 

Add 16x16 emoticon set for MXit.
Images converted to 16x16 from the default emoticon set.


Changes against parent 10ee9bf6c559ffd9edb93b5ce81dd4ab07d5c5bf

  added    pidgin/pixmaps/emotes/small/16/boy.png
  added    pidgin/pixmaps/emotes/small/16/chilli.png
  added    pidgin/pixmaps/emotes/small/16/drool.png
  added    pidgin/pixmaps/emotes/small/16/excruciating.png
  added    pidgin/pixmaps/emotes/small/16/eyeroll.png
  added    pidgin/pixmaps/emotes/small/16/girl.png
  added    pidgin/pixmaps/emotes/small/16/lamp.png
  added    pidgin/pixmaps/emotes/small/16/lying.png
  added    pidgin/pixmaps/emotes/small/16/mrgreen.png
  added    pidgin/pixmaps/emotes/small/16/pirate.png
  added    pidgin/pixmaps/emotes/small/16/pissed-off.png
  added    pidgin/pixmaps/emotes/small/16/rose.png
  added    pidgin/pixmaps/emotes/small/16/shut-mouth.png
  added    pidgin/pixmaps/emotes/small/16/star.png
  patched  pidgin/pixmaps/emotes/small/16/Makefile.am
  patched  pidgin/pixmaps/emotes/small/16/amorous.png
  patched  pidgin/pixmaps/emotes/small/16/embarrassed.png
  patched  pidgin/pixmaps/emotes/small/16/excited.png
  patched  pidgin/pixmaps/emotes/small/16/hungry.png
  patched  pidgin/pixmaps/emotes/small/16/sleeping.png
  patched  pidgin/pixmaps/emotes/small/16/small.theme.in
  attr on  pidgin/pixmaps/emotes/small/16/boy.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/chilli.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/drool.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/excruciating.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/eyeroll.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/girl.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/lamp.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/lying.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/mrgreen.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/pirate.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/pissed-off.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/rose.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/shut-mouth.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/star.png
      set  mtn:manual_merge
       to  true

-------------- next part --------------
============================================================
# pidgin/pixmaps/emotes/small/16/sleeping.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/excited.png is binary
============================================================
--- pidgin/pixmaps/emotes/small/16/small.theme.in	d5b2c5473fdae0473d7d7dea5d90832d340cc2f8
+++ pidgin/pixmaps/emotes/small/16/small.theme.in	1fa27b59bb4ae1102a9cf05a8e95cefe6a5d861e
@@ -230,3 +230,46 @@ kiss.png            :x
 sad.png		    :[
 kiss.png            :x
 
+# MXit standard emoticons
+[MXit]
+happy.png           :-)     :)
+sad.png             :-(     :(
+wink.png            ;-)     ;)
+excited.png         :-D     :D     :->      :>
+neutral.png         :-|     :|
+shocked.png         :-O     :O
+tongue.png          :-P     :P
+embarrassed.png     :-$     :$
+cool.png            8-)
+in_love.png         (H)
+rose.png            (F)
+### Added in v3.0
+boy.png             (m)
+girl.png            (f)
+star.png            (*)
+chilli.png          (c)
+kiss.png            (x)
+lamp.png            (i)
+pissed-off.png      :e      :-e
+shut-mouth.png      :-x     :x
+grumpy.png          (z)
+coffee.png          (U)
+mrgreen.png         (G)
+### Added in v5.0
+sick.png            :o(
+excruciating.png    :-{     :{
+amorous.png         :-}     :}
+eyeroll.png         8-o     8o
+crying.png          :'(
+thinking.png        :-?     :?
+drool.png           :-~     :~
+sleeping.png        :-z     :z
+lying.png           :L)
+nerdy.png           8-|     8|
+pirate.png          P-)
+### Added in v5.9.7
+bored.png           :-[     :[
+cold.png            :-<     :<
+confused.png        :-,     :,
+hungry.png          :-C     :C
+stressed.png        :-s     :s
============================================================
--- pidgin/pixmaps/emotes/small/16/Makefile.am	6e7aac936fa3c87c61ee8a2d72efe2a9b9eff642
+++ pidgin/pixmaps/emotes/small/16/Makefile.am	0be7eed12acd41cac054402e473909d47c68aa09
@@ -26,7 +26,9 @@ SMILEYS = \
     angry.png \
     beer.png \
     bored.png \
+    boy.png \
     camera.png \
+    chilli.png \
     cigarette.png \
     coffee.png \
     confused.png \
@@ -37,7 +39,11 @@ SMILEYS = \
     crying.png \
     devil.png \
     dont-know.png \
+    drool.png \
     excited.png \
+    excruciating.png \
+    eyeroll.png \
+    girl.png \
     grin.png \
     happy.png \
     hug-left.png \
@@ -45,22 +51,30 @@ SMILEYS = \
     hungry.png \
     in_love.png \
     kiss.png \
+    lamp.png \
+    lying.png \
     meeting.png \
     mobile.png \
+    mrgreen.png \
     musical-note.png \
     nerdy.png \
     neutral.png \
     party.png \
     phone.png \
+    pirate.png \
+    pissed-off.png \
     plate.png \
     question.png \
+    rose.png \
     sad.png \
     shame.png \
     shocked.png \
+    shut-mouth.png  \
     sick.png \
     silent.png \
     sleeping.png \
     sleepy.png \
+    star.png \
     stressed.png \
     thinking.png \
     tongue.png \
============================================================
# pidgin/pixmaps/emotes/small/16/amorous.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/embarrassed.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/hungry.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/boy.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/chilli.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/drool.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/excruciating.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/eyeroll.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/girl.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/lamp.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/lying.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/mrgreen.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/pirate.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/pissed-off.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/rose.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/shut-mouth.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/star.png is binary


More information about the Commits mailing list