comparison libpurple/protocols/mxit/roster.c @ 28659:1375fd2d9df2

propagate from branch 'im.pidgin.pidgin' (head d330e81020232653571a0d5b1f5c927bc148a6fe) to branch 'im.pidgin.pidgin.mxit' (head f160c344624e9fdd06fd3a5e7eb58bcb772274dd)
author andrew.victor@mxit.com
date Wed, 25 Nov 2009 08:17:02 +0000
parents bbc3eac0ee95
children 259bbfb423d4
comparison
equal deleted inserted replaced
28637:0e70cbf43934 28659:1375fd2d9df2
51 int mxit; 51 int mxit;
52 const char* id; 52 const char* id;
53 const char* name; 53 const char* name;
54 } const mxit_statuses[] = { 54 } const mxit_statuses[] = {
55 /* primative, no, id, name */ 55 /* primative, no, id, name */
56 { PURPLE_STATUS_OFFLINE, MXIT_PRESENCE_OFFLINE, "offline", NULL }, /* 0 */ 56 { PURPLE_STATUS_OFFLINE, MXIT_PRESENCE_OFFLINE, "offline", N_( "Offline" ) }, /* 0 */
57 { PURPLE_STATUS_AVAILABLE, MXIT_PRESENCE_ONLINE, "online", NULL }, /* 1 */ 57 { PURPLE_STATUS_AVAILABLE, MXIT_PRESENCE_ONLINE, "online", N_( "Available" ) }, /* 1 */
58 { PURPLE_STATUS_AWAY, MXIT_PRESENCE_AWAY, "away", NULL }, /* 2 */ 58 { PURPLE_STATUS_AWAY, MXIT_PRESENCE_AWAY, "away", N_( "Away" ) }, /* 2 */
59 { PURPLE_STATUS_AVAILABLE, MXIT_PRESENCE_AVAILABLE, "chat", N_( "Chatty" ) }, /* 3 */ 59 { PURPLE_STATUS_AVAILABLE, MXIT_PRESENCE_AVAILABLE, "chat", N_( "Chatty" ) }, /* 3 */
60 { PURPLE_STATUS_UNAVAILABLE, MXIT_PRESENCE_DND, "dnd", NULL } /* 4 */ 60 { PURPLE_STATUS_UNAVAILABLE, MXIT_PRESENCE_DND, "dnd", N_( "Do Not Disturb" ) } /* 4 */
61 }; 61 };
62 62
63 63
64 /*------------------------------------------------------------------------ 64 /*------------------------------------------------------------------------
65 * Return list of supported statuses. (see status.h) 65 * Return list of supported statuses. (see status.h)
396 if ( contact->statusMsg ) { 396 if ( contact->statusMsg ) {
397 g_free( contact->statusMsg ); 397 g_free( contact->statusMsg );
398 contact->statusMsg = NULL; 398 contact->statusMsg = NULL;
399 } 399 }
400 if ( statusMsg[0] != '\0' ) 400 if ( statusMsg[0] != '\0' )
401 contact->statusMsg = g_strdup( statusMsg ); 401 contact->statusMsg = g_markup_escape_text( statusMsg, -1 );
402 402
403 /* update avatarId */ 403 /* update avatarId */
404 if ( ( contact->avatarId ) && ( g_ascii_strcasecmp( contact->avatarId, avatarId ) == 0 ) ) { 404 if ( ( contact->avatarId ) && ( g_ascii_strcasecmp( contact->avatarId, avatarId ) == 0 ) ) {
405 /* avatar has not changed - do nothing */ 405 /* avatar has not changed - do nothing */
406 } 406 }