# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1228151135 0
# Node ID 6476ee291f16c390642c6d2cb0abdb0f0bd23316
# Parent  59c3a33ba3b6666be53271a0f61d7b76cb891854# Parent  1a579e1cdc582a98151bea58dc4c757079d992c5
merge of 'c3f6487e649e7fe5c5f960b9c86a256e09b3976e'
     and 'c93a08f77b8f726dc4df7516c03ae16e44161b63'

diff -r 59c3a33ba3b6 -r 6476ee291f16 COPYRIGHT
--- 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
diff -r 59c3a33ba3b6 -r 6476ee291f16 ChangeLog
--- 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)
diff -r 59c3a33ba3b6 -r 6476ee291f16 libpurple/purple-remote
--- 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)
diff -r 59c3a33ba3b6 -r 6476ee291f16 pidgin/pixmaps/emotes/default/24/default.theme.in
--- 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/
diff -r 59c3a33ba3b6 -r 6476ee291f16 pidgin/pixmaps/emotes/small/16/small.theme.in
--- 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/