# HG changeset patch # User andrew.victor@mxit.com # Date 1280319688 0 # Node ID b803b8a45dabdbf35198dbb1bbe51e40f47ec17d # Parent 18a903a3b474022d05940a770f8593e225617f3e Add new MXit emoticons. diff -r 18a903a3b474 -r b803b8a45dab pidgin/pixmaps/emotes/default/24/Makefile.am --- a/pidgin/pixmaps/emotes/default/24/Makefile.am Wed Jul 28 08:41:51 2010 +0000 +++ b/pidgin/pixmaps/emotes/default/24/Makefile.am Wed Jul 28 12:21:28 2010 +0000 @@ -14,6 +14,7 @@ beer.png \ blowkiss.png \ bomb.png \ + bored.png \ bowl.png \ boy.png \ brb.png \ @@ -36,6 +37,7 @@ clown.png \ coffee.png \ coins.png \ + cold.png \ computer.png \ confused.png \ console.png \ @@ -168,6 +170,7 @@ star.png \ starving.png \ stop.png \ + stressed.png \ struggle.png \ sun.png \ hot.png \ diff -r 18a903a3b474 -r b803b8a45dab pidgin/pixmaps/emotes/default/24/bored.png Binary file pidgin/pixmaps/emotes/default/24/bored.png has changed diff -r 18a903a3b474 -r b803b8a45dab pidgin/pixmaps/emotes/default/24/cold.png Binary file pidgin/pixmaps/emotes/default/24/cold.png has changed diff -r 18a903a3b474 -r b803b8a45dab pidgin/pixmaps/emotes/default/24/default.theme.in --- a/pidgin/pixmaps/emotes/default/24/default.theme.in Wed Jul 28 08:41:51 2010 +0000 +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in Wed Jul 28 12:21:28 2010 +0000 @@ -489,3 +489,9 @@ lying.png :L) glasses-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 diff -r 18a903a3b474 -r b803b8a45dab pidgin/pixmaps/emotes/default/24/stressed.png Binary file pidgin/pixmaps/emotes/default/24/stressed.png has changed