changeset
Backported from 3.0.0-devel:
Sat, 28 Jul 2012 22:22:20 +0200
- author
- Andrew Victor <andrew.victor@mxit.com>
- date
- Sat, 28 Jul 2012 22:22:20 +0200
- branch
- mxit-2.x.y
- changeset 33205
- 3fa3e6160228
- parent 33204
- 6a68fcbadb5c
- child 33206
- 12d65cad702b
Backported from 3.0.0-devel:
If a contact did not have a status-message or mood set, the "status_text"
callback would return an empty ("") string.
This causes the buddy list (with buddy details enabled) to display the
contact's alias not in line with the status icon - which looked odd.
Now we return NULL if there is no status-message or mood set.
(Ref: http://pidgin.im/pipermail/commits/2011-August/019653.html)
| libpurple/protocols/mxit/mxit.c | file | annotate | diff | comparison | revisions |
--- a/libpurple/protocols/mxit/mxit.c Sat Jul 28 22:16:05 2012 +0200 +++ b/libpurple/protocols/mxit/mxit.c Sat Jul 28 22:22:20 2012 +0200 @@ -309,19 +309,18 @@ */ char* mxit_status_text( PurpleBuddy* buddy ) { + char* text = NULL; struct contact* contact = purple_buddy_get_protocol_data( buddy ); if ( !contact ) return NULL; - if ( contact->statusMsg ) { - /* status message */ - return g_strdup( contact-> statusMsg ); - } - else { - /* mood */ - return g_strdup( mxit_convert_mood_to_name( contact->mood ) ); - } + if ( contact->statusMsg ) /* status message */ + text = g_strdup( contact-> statusMsg ); + else if ( contact->mood != MXIT_MOOD_NONE ) /* mood */ + text = g_strdup( mxit_convert_mood_to_name( contact->mood ) ); + + return text; }
