Mercurial > pidgin.yaz
changeset 30738:18a903a3b474
Add the new Moods.
| author | andrew.victor@mxit.com |
|---|---|
| date | Wed, 28 Jul 2010 08:41:51 +0000 |
| parents | 6d6ac5720853 |
| children | b803b8a45dab |
| files | libpurple/protocols/mxit/roster.c libpurple/protocols/mxit/roster.h |
| diffstat | 2 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/mxit/roster.c Wed Jul 28 08:36:54 2010 +0000 +++ b/libpurple/protocols/mxit/roster.c Wed Jul 28 08:41:51 2010 +0000 @@ -145,6 +145,11 @@ {"hot", N_("Hot"), NULL}, {"sick", N_("Sick"), NULL}, {"sleepy", N_("Sleepy"), NULL}, + {"bored", N_("Bored"), NULL}, + {"cold", N_("Cold"), NULL}, + {"confused", N_("Confused"), NULL}, + {"hungry", N_("Hungry"), NULL}, + {"stressed", N_("Stressed"), NULL}, /* Mark the last record. */ { NULL, NULL, NULL } }; @@ -213,6 +218,16 @@ return _( "Sick" ); case MXIT_MOOD_SLEEPY : return _( "Sleepy" ); + case MXIT_MOOD_BORED : + return _( "Bored" ); + case MXIT_MOOD_COLD : + return _( "Cold" ); + case MXIT_MOOD_CONFUSED : + return _( "Confused" ); + case MXIT_MOOD_HUNGRY : + return _( "Hungry" ); + case MXIT_MOOD_STRESSED : + return _( "Stressed" ); case MXIT_MOOD_NONE : default : return ""; @@ -457,7 +472,7 @@ contact->mood = mood; /* validate mood */ - if (( contact->mood < MXIT_MOOD_NONE ) || ( contact->mood > MXIT_MOOD_SLEEPY )) + if (( contact->mood < MXIT_MOOD_NONE ) || ( contact->mood > MXIT_MOOD_STRESSED )) contact->mood = MXIT_MOOD_NONE; g_strlcpy( contact->customMood, customMood, sizeof( contact->customMood ) );
--- a/libpurple/protocols/mxit/roster.h Wed Jul 28 08:36:54 2010 +0000 +++ b/libpurple/protocols/mxit/roster.h Wed Jul 28 08:41:51 2010 +0000 @@ -66,6 +66,11 @@ #define MXIT_MOOD_HOT 0x08 #define MXIT_MOOD_SICK 0x09 #define MXIT_MOOD_SLEEPY 0x0A +#define MXIT_MOOD_BORED 0x0B +#define MXIT_MOOD_COLD 0x0C +#define MXIT_MOOD_CONFUSED 0x0D +#define MXIT_MOOD_HUNGRY 0x0E +#define MXIT_MOOD_STRESSED 0x0F /* MXit contact flags */