Mercurial > pidgin
changeset 24575:6476ee291f16
merge of 'c3f6487e649e7fe5c5f960b9c86a256e09b3976e'
and 'c93a08f77b8f726dc4df7516c03ae16e44161b63'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 01 Dec 2008 17:05:35 +0000 |
| parents | 59c3a33ba3b6 (current diff) 1a579e1cdc58 (diff) |
| children | 006e2e385631 103d0d6ffab6 89b95d143116 |
| files | pidgin/pixmaps/status/48/rtl/login.png pidgin/pixmaps/status/48/rtl/logout.png |
| diffstat | 5 files changed, 41 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sun Nov 30 05:57:36 2008 +0000 +++ b/COPYRIGHT Mon Dec 01 17:05:35 2008 +0000 @@ -338,6 +338,7 @@ Dennis Ristuccia Lee Roach Eion Robb +Kahlil Robinson Rhett Robinson Luciano Miguel Ferreira Rocha Andrew Rodland
--- a/ChangeLog Sun Nov 30 05:57:36 2008 +0000 +++ b/ChangeLog Mon Dec 01 17:05:35 2008 +0000 @@ -14,6 +14,8 @@ * The Buddy State Notification plugin no longer turns JID's, MSN Passport ID's, etc. into links (Florian Quèze) * Fix a crash in SIMPLE when a malformed message is received. + * purple-remote now has a "getstatusmessage" command to retrieve the text + of the current status message. Gadu-Gadu: * Fix some problems with Gadu-Gadu buddy icons (Adam Strzelecki)
--- a/libpurple/purple-remote Sun Nov 30 05:57:36 2008 +0000 +++ b/libpurple/purple-remote Mon Dec 01 17:05:35 2008 +0000 @@ -172,6 +172,10 @@ status_id = purple.PurplePrimitiveGetIdFromType(status_type) return status_id + elif command == "getstatusmessage": + current = purple.PurpleSavedstatusGetCurrent() + return purple.PurpleSavedstatusGetMessage(current) + elif command == "getinfo": account = findaccount(accountname, protocol) connection = cpurple.PurpleAccountGetConnection(account)
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in Sun Nov 30 05:57:36 2008 +0000 +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in Mon Dec 01 17:05:35 2008 +0000 @@ -392,3 +392,20 @@ 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 +glasses-cool.png B-) +angry.png X-( +sad.png :( +crying.png :'( +neutral.png :-| +thinking.png :-/ +love.png <3 +monkey.png :(|) +victory.png \\m/
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in Sun Nov 30 05:57:36 2008 +0000 +++ b/pidgin/pixmaps/emotes/small/16/small.theme.in Mon Dec 01 17:05:35 2008 +0000 @@ -154,3 +154,20 @@ 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 +glasses-cool.png B-) +angry.png X-( +sad.png :( +crying.png :'( +neutral.png :-| +thinking.png :-/ +love.png <3 +monkey.png :(|) +victory.png \\m/