summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Laager <rlaager@pidgin.im>2008-11-16 18:53:25 +0000
committerRichard Laager <rlaager@pidgin.im>2008-11-16 18:53:25 +0000
commitd6fc6601f2e646bd0298d5a66c15a70bd3a80e3a (patch)
tree728009d69a0be70e9faba34ca4d956ba171abb60
parent692732bc1ce79f9c01e7f18769a566b81b17499d (diff)
downloadpidgin-d6fc6601f2e646bd0298d5a66c15a70bd3a80e3a.tar.gz
Added the additional moods defined in XEP-0107 version 1.2 (2008-10-29):
http://xmpp.org/extensions/xep-0107.html
-rw-r--r--libpurple/protocols/jabber/usermood.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/libpurple/protocols/jabber/usermood.c b/libpurple/protocols/jabber/usermood.c
index 3ff09d0402..dfd38cf15a 100644
--- a/libpurple/protocols/jabber/usermood.c
+++ b/libpurple/protocols/jabber/usermood.c
@@ -31,6 +31,7 @@
static const char * const moodstrings[] = {
"afraid",
"amazed",
+ "amorous",
"angry",
"annoyed",
"anxious",
@@ -39,22 +40,33 @@ static const char * const moodstrings[] = {
"bored",
"brave",
"calm",
+ "cautious",
"cold",
+ "confident",
"confused",
+ "contemplative",
"contented",
"cranky",
+ "crazy",
+ "creative",
"curious",
+ "dejected",
"depressed",
"disappointed",
"disgusted",
+ "dismayed",
"distracted",
"embarrassed",
+ "envious",
"excited",
"flirtatious",
"frustrated",
+ "grateful",
+ "grieving",
"grumpy",
"guilty",
"happy",
+ "hopeful",
"hot",
"humbled",
"humiliated",
@@ -69,26 +81,37 @@ static const char * const moodstrings[] = {
"invincible",
"jealous",
"lonely",
+ "lost",
+ "lucky",
"mean",
"moody",
"nervous",
"neutral",
"offended",
+ "outraged",
"playful",
"proud",
+ "relaxed",
"relieved",
"remorseful",
"restless",
"sad",
"sarcastic",
+ "satisfied",
"serious",
"shocked",
"shy",
"sick",
"sleepy",
+ "spontaneous",
"stressed",
+ "strong",
"surprised",
+ "thankful",
"thirsty",
+ "tired",
+ "undefined",
+ "weak",
"worried",
NULL
};