pidgin.mxit: 49cce519: These status strings are accessed from m...

[andrew.victor at mxit.com]

-----------------------------------------------------------------
Revision: 49cce519768927339801f56f4a1c6c042bf55fe4
Ancestor: 19bd9478a2f62f9e6ccd540f83c1ef24f308ff24
Author: andrew.victor at mxit.com
Date: 2009-11-24T15:12:42
Branch: im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/49cce519768927339801f56f4a1c6c042bf55fe4

Modified files:
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/roster.c

ChangeLog: 

These status strings are accessed from mxit_convert_presence_to_name() for the
Buddy List tooltip, so they cannot be NULL.


-------------- next part --------------
============================================================
--- libpurple/protocols/mxit/formcmds.c	309b831584156b864558a261e92fb8fae23ac13b
+++ libpurple/protocols/mxit/formcmds.c	669d971c6034a96bdf54932edd403a4183d861c7
@@ -345,7 +345,6 @@ static void command_image(struct RXMsgDa
  *  @param message			The message text
  *  @return					The length of the command
  */
-//void mxit_command_received(struct MXitSession* session, const char* from, char* message, time_t timestamp)
 int mxit_parse_command(struct RXMsgData* mx, char* message)
 {
 	GHashTable* hash	= NULL;
============================================================
--- libpurple/protocols/mxit/markup.c	5a0ff9401003fb598b836c3a09548984d2f888cc
+++ libpurple/protocols/mxit/markup.c	cdcd3e3f6f00f21a463eee8a67e11b17e01bd706
@@ -416,7 +416,6 @@ void mxit_show_message( struct RXMsgData
 	}
 	else if ( mx->chatid < 0 ) {
 		/* normal chat message */
-		//serv_got_im( mx->session->con, mx->from, mx->msg->str, mx->flags, mx->timestamp );
 		mxit_show_split_message( mx );
 	}
 	else {
============================================================
--- libpurple/protocols/mxit/roster.c	4cd7094c50231501e703b9984f0aa5e0e4101d77
+++ libpurple/protocols/mxit/roster.c	53f664607bd5214e9b3e63355b3b44210a160360
@@ -53,11 +53,11 @@ static struct status
 	const char*				name;
 } const mxit_statuses[] = {
 		/*	primative,						no,							id,			name					*/
-		{	PURPLE_STATUS_OFFLINE,			MXIT_PRESENCE_OFFLINE,		"offline",	NULL				},	/* 0 */
-		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_ONLINE,		"online",	NULL				},	/* 1 */
-		{	PURPLE_STATUS_AWAY,				MXIT_PRESENCE_AWAY,			"away",		NULL				},	/* 2 */
-		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_AVAILABLE,	"chat",		N_( "Chatty" )		},	/* 3 */
-		{	PURPLE_STATUS_UNAVAILABLE,		MXIT_PRESENCE_DND,			"dnd",		NULL				}	/* 4 */
+		{	PURPLE_STATUS_OFFLINE,			MXIT_PRESENCE_OFFLINE,		"offline",	N_( "Offline" )			},	/* 0 */
+		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_ONLINE,		"online",	N_( "Available" )		},	/* 1 */
+		{	PURPLE_STATUS_AWAY,				MXIT_PRESENCE_AWAY,			"away",		N_( "Away" )			},	/* 2 */
+		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_AVAILABLE,	"chat",		N_( "Chatty" )			},	/* 3 */
+		{	PURPLE_STATUS_UNAVAILABLE,		MXIT_PRESENCE_DND,			"dnd",		N_( "Do Not Disturb" )	}	/* 4 */
 };