/pidgin/main: 1fe2f250ff9e: Update with changes in release-2.x.y

[Andrew Victor]

Changeset: 1fe2f250ff9ebbe9e317e1d19c6fa5270e46c30f
Author:	 Andrew Victor <andrew.victor at mxit.com>
Date:	 2012-12-18 15:57 +0200
Branch:	 mxit-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/1fe2f250ff9e

Description:

Update with changes in release-2.x.y

diffstat:

 libpurple/protocols/mxit/markup.c |  5 +----
 libpurple/protocols/mxit/mxit.c   |  4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff --git a/libpurple/protocols/mxit/markup.c b/libpurple/protocols/mxit/markup.c
--- a/libpurple/protocols/mxit/markup.c
+++ b/libpurple/protocols/mxit/markup.c
@@ -1005,11 +1005,8 @@ void mxit_parse_markup( struct RXMsgData
 
 	if ( msgflags & CP_MSG_FAREWELL ) {
 		/* this is a farewell message */
-		GString* premsg = g_string_sized_new( 36 );
-		g_string_append_printf( premsg, "<font color=\"%s\"><i>", MXIT_FAREWELL_MSG_COLOR );
-		g_string_prepend( mx->msg, premsg->str );
+		g_string_prepend( mx->msg, "<font color=\""MXIT_FAREWELL_MSG_COLOR"\"><i>" );
 		g_string_append( mx->msg, "</i></font>" );
-		g_string_free( premsg, TRUE );
 	}
 }
 
diff --git a/libpurple/protocols/mxit/mxit.c b/libpurple/protocols/mxit/mxit.c
--- a/libpurple/protocols/mxit/mxit.c
+++ b/libpurple/protocols/mxit/mxit.c
@@ -675,7 +675,7 @@ static unsigned int mxit_send_typing( Pu
 	struct MXitSession*	session		= purple_connection_get_protocol_data( gc );
 	PurpleBuddy*		buddy;
 	struct contact*		contact;
-	gchar*				messageId	= purple_uuid_random();		/* generate a unique message id */
+	gchar*				messageId	= NULL;
 
 	/* find the buddy information for this contact (reference: "libpurple/blist.h") */
 	buddy = purple_find_buddy( account, name );
@@ -692,6 +692,8 @@ static unsigned int mxit_send_typing( Pu
 	if ( ! ( contact->capabilities & MXIT_PFLAG_TYPING ) )
 		return 0;
 
+	messageId = purple_uuid_random();		/* generate a unique message id */
+
 	switch ( state ) {
 		case PURPLE_TYPING :		/* currently typing */
 			mxit_send_msgevent( session, name, messageId, CP_MSGEVENT_TYPING );