HGKeeper

pidgin/android/libpurple

Merge with release-2.x.y
mxit-2.x.y
2013-04-03, Andrew Victor

07ffa66fd57b

Parents 7a40d62c81d8 7cd76ebbe8d1
Children

Merge with release-2.x.y

20 files changed, 155 insertions(+), 150 deletions(-)

+2 -2

libpurple/plugins/ssl/ssl-nss.c

+4 -3

libpurple/protocols/mxit/actions.c

+3 -2

libpurple/protocols/mxit/chunk.c

+18 -18

libpurple/protocols/mxit/cipher.c

+28 -16

libpurple/protocols/mxit/filexfer.c

+3 -5

libpurple/protocols/mxit/formcmds.c

+1 -3

libpurple/protocols/mxit/formcmds.h

+2 -2

libpurple/protocols/mxit/http.c

+5 -3

libpurple/protocols/mxit/login.c

+12 -12

libpurple/protocols/mxit/markup.c

+1 -2

libpurple/protocols/mxit/multimx.c

+4 -4

libpurple/protocols/mxit/mxit.c

+1 -2

libpurple/protocols/mxit/profile.c

+1 -3

libpurple/protocols/mxit/profile.h

+59 -58

libpurple/protocols/mxit/protocol.c

+5 -5

libpurple/protocols/mxit/roster.c

+1 -1

libpurple/protocols/mxit/roster.h

+2 -2

libpurple/protocols/mxit/splashscreen.c

+3 -2

libpurple/protocols/mxit/voicevideo.c

+0 -5

libpurple/protocols/mxit/voicevideo.h

~~--- a/libpurple/plugins/ssl/ssl-nss.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/plugins/ssl/ssl-nss.c Wed Apr 03 11:21:06 2013 +0200

@@ -473,7 +473,7 @@

static size_t

ssl_nss_read(PurpleSslConnection *gsc, void *data, size_t len)

{

~~- ssize_t ret;~~

+ PRInt32 ret;

PurpleSslNssData *nss_data = PURPLE_SSL_NSS_DATA(gsc);

ret = PR_Read(nss_data->in, data, len);

@@ -487,7 +487,7 @@

static size_t

ssl_nss_write(PurpleSslConnection *gsc, const void *data, size_t len)

{

~~- ssize_t ret;~~

+ PRInt32 ret;

PurpleSslNssData *nss_data = PURPLE_SSL_NSS_DATA(gsc);

if(!nss_data)

~~--- a/libpurple/protocols/mxit/actions.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/actions.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,9 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

+#include "request.h"

#include "protocol.h"

#include "mxit.h"

@@ -186,7 +187,7 @@

profile->flags &= ~CP_PROF_NOT_SUGGESTABLE;

else

profile->flags |= CP_PROF_NOT_SUGGESTABLE;

~~- g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%i", CP_PROFILE_FLAGS, CP_PROFILE_TYPE_LONG, profile->flags);~~

+ g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%" G_GINT64_FORMAT, CP_PROFILE_FLAGS, CP_PROFILE_TYPE_LONG, profile->flags);

g_string_append( attributes, attrib );

acount++;

~~--- a/libpurple/protocols/mxit/chunk.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/chunk.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,9 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

#include "protocol.h"

#include "mxit.h"

#include "chunk.h"

~~--- a/libpurple/protocols/mxit/cipher.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/cipher.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,8 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

#include "mxit.h"

#include "cipher.h"

@@ -107,12 +107,12 @@

char* mxit_encrypt_password( struct MXitSession* session )

{

~~- char key[16 + 1];~~

~~- char exkey[512];~~

~~- GString* pass = NULL;~~

~~- GString* encrypted = NULL;~~

~~- char* base64;~~

~~- int i;~~

+ char key[16 + 1];

+ char exkey[512];

+ GString* pass = NULL;

+ GString* encrypted = NULL;

+ char* base64;

+ unsigned int i;

purple_debug_info( MXIT_PLUGIN_ID, "mxit_encrypt_password\n" );

@@ -154,11 +154,11 @@

char* mxit_decrypt_message( struct MXitSession* session, char* message )

{

~~- guchar* raw_message;~~

~~- gsize raw_len;~~

~~- char exkey[512];~~

~~- GString* decoded = NULL;~~

~~- int i;~~

+ guchar* raw_message;

+ gsize raw_len;

+ char exkey[512];

+ GString* decoded = NULL;

+ unsigned int i;

/* remove optional header: <mxitencrypted ver="5.2"/> */

if ( strncmp( message, ENCRYPT_HEADER, strlen( ENCRYPT_HEADER ) ) == 0 )

@@ -209,11 +209,11 @@

char* mxit_encrypt_message( struct MXitSession* session, char* message )

{

~~- GString* raw_message = NULL;~~

~~- char exkey[512];~~

~~- GString* encoded = NULL;~~

~~- gchar* base64;~~

~~- int i;~~

+ GString* raw_message = NULL;

+ char exkey[512];

+ GString* encoded = NULL;

+ gchar* base64;

+ unsigned int i;

purple_debug_info( MXIT_PLUGIN_ID, "encrypt message: '%s'\n", message );

~~--- a/libpurple/protocols/mxit/filexfer.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/filexfer.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,9 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

#include "protocol.h"

#include "mxit.h"

#include "chunk.h"

@@ -97,7 +98,7 @@

static void mxit_xfer_free( PurpleXfer* xfer )

{

~~- struct mxitxfer* mx = (struct mxitxfer*) xfer->data;;~~

+ struct mxitxfer* mx = (struct mxitxfer*) xfer->data;;

if ( mx ) {

g_free( mx );

@@ -153,7 +154,6 @@

{

goffset filesize;

unsigned char* buffer;

~~- int size;~~

int wrote;

purple_debug_info( MXIT_PLUGIN_ID, "mxit_xfer_start\n" );

@@ -166,12 +166,18 @@

filesize = purple_xfer_get_bytes_remaining( xfer );

buffer = g_malloc( filesize );

~~- size = fread( buffer, filesize, 1, xfer->dest_fp );~~

~~- // TODO: If (size != 1) -> file read error~~

~~- wrote = purple_xfer_write( xfer, buffer, filesize );~~

~~- if ( wrote > 0 )~~

~~- purple_xfer_set_bytes_sent( xfer, wrote );~~

+ if ( fread( buffer, filesize, 1, xfer->dest_fp ) > 0 ) {

+ /* send data */

+ wrote = purple_xfer_write( xfer, buffer, filesize );

+ if ( wrote > 0 )

+ purple_xfer_set_bytes_sent( xfer, wrote );

+ }

+ else {

+ /* file read error */

+ purple_xfer_error( purple_xfer_get_type( xfer ), purple_xfer_get_account( xfer ), purple_xfer_get_remote_user( xfer ), _( "Unable to access the local file" ) );

+ purple_xfer_cancel_local( xfer );

+ }

/* free the buffer */

g_free( buffer );

@@ -436,14 +442,20 @@

/* this is the transfer we have been looking for */

purple_xfer_ref( xfer );

purple_xfer_start( xfer, -1, NULL, 0 );

~~- fwrite( data, datalen, 1, xfer->dest_fp );~~

~~- // TODO: Handle error from fwrite()~~

~~- purple_xfer_unref( xfer );~~

~~- purple_xfer_set_completed( xfer, TRUE );~~

~~- purple_xfer_end( xfer );~~

+ if ( fwrite( data, datalen, 1, xfer->dest_fp ) > 0 ) {

+ purple_xfer_unref( xfer );

+ purple_xfer_set_completed( xfer, TRUE );

+ purple_xfer_end( xfer );

~~- /* inform MXit that file was successfully received */~~

~~- mxit_send_file_received( session, fileid, RECV_STATUS_SUCCESS );~~

+ /* inform MXit that file was successfully received */

+ mxit_send_file_received( session, fileid, RECV_STATUS_SUCCESS );

+ }

+ else {

+ /* file write error */

+ purple_xfer_error( purple_xfer_get_type( xfer ), purple_xfer_get_account( xfer ), purple_xfer_get_remote_user( xfer ), _( "Unable to save the file" ) );

+ purple_xfer_cancel_local( xfer );

+ }

}

else {

/* file transfer not found */

~~--- a/libpurple/protocols/mxit/formcmds.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/formcmds.c Wed Apr 03 11:21:06 2013 +0200

@@ -25,9 +25,7 @@

#include "internal.h"

~~-#include <glib.h>~~

~~-#include "purple.h"~~

+#include "debug.h"

#include "protocol.h"

#include "mxit.h"

@@ -475,7 +473,7 @@

* menu ::= <menuitem> { ";" <menuitem> }

* menuitem ::= { type "," <text> "," <name> "," <meta> }

* colors ::= <color> { ";" <color> }

~~- * color ::= <colorid> "," <ARGB hex color>~~

+ * color ::= <colorid> "," <ARGB hex color>

* @param session The MXit session object

* @param from The sender of the message.

@@ -530,7 +528,7 @@

/* number of columns */

tmp = g_hash_table_lookup(hash, "col");

~~- nr_columns = atoi(tmp);~~

+ nr_columns = atoi(tmp);

/* number of rows */

tmp = g_hash_table_lookup(hash, "row");

~~--- a/libpurple/protocols/mxit/formcmds.h Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/formcmds.h Wed Apr 03 11:21:06 2013 +0200

@@ -26,10 +26,8 @@

#ifndef _MXIT_FORMCMDS_H_

#define _MXIT_FORMCMDS_H_

~~-#include "mxit.h"~~

+#include "protocol.h"

int mxit_parse_command(struct RXMsgData* mx, char* message);

#endif /* _MXIT_FORMCMDS_H_ */

~~--- a/libpurple/protocols/mxit/http.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/http.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,8 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

#include "mxit.h"

#include "protocol.h"

~~--- a/libpurple/protocols/mxit/login.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/login.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,10 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

+#include "request.h"

+#include "version.h"

#include "protocol.h"

#include "mxit.h"

@@ -57,7 +59,7 @@

const char* username = purple_account_get_username( account );

if ( username[0] == '+' ) {

~~- char* fixed = g_strdup( &username[1] );~~

+ char* fixed = g_strdup( &username[1] );

purple_account_set_username( account, fixed );

g_free( fixed );

}

~~--- a/libpurple/protocols/mxit/markup.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/markup.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,8 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

#include "protocol.h"

#include "mxit.h"

@@ -202,7 +202,7 @@

* @param utf8 The extracted string. Must be deallocated by caller.

* @return The number of bytes extracted

~~-static int asn_getUtf8( const char* data, char type, char** utf8 )~~

+static int asn_getUtf8( const char* data, unsigned char type, char** utf8 )

{

int len;

@@ -249,12 +249,12 @@

{

GString* msg = NULL;

char* ch = NULL;

~~- int pos = 0;~~

~~- int start = 0;~~

~~- int l_nl = 0;~~

~~- int l_sp = 0;~~

~~- int l_gt = 0;~~

~~- int stop = 0;~~

+ unsigned int pos = 0;

+ unsigned int start = 0;

+ unsigned int l_nl = 0;

+ unsigned int l_sp = 0;

+ unsigned int l_gt = 0;

+ unsigned int stop = 0;

int tags = 0;

gboolean intag = FALSE;

@@ -391,7 +391,7 @@

if ( end == mx->msg->len ) /* end of emoticon tag not found */

break;

~~- ii = g_strndup(&mx->msg->str[emo_ofs], end - emo_ofs);~~

+ ii = g_strndup( &mx->msg->str[emo_ofs], end - emo_ofs );

/* remove inline image tag */

g_string_erase( mx->msg, start, ( end - start ) + 1 );

@@ -408,7 +408,7 @@

g_string_insert( mx->msg, start, tag );

}

~~- g_free(ii);~~

+ g_free( ii );

}

@@ -651,7 +651,7 @@

static int mxit_parse_vibe( struct RXMsgData* mx, const char* message )

{

~~- int vibeid;~~

+ unsigned int vibeid;

vibeid = message[2] - '0';

~~--- a/libpurple/protocols/mxit/multimx.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/multimx.c Wed Apr 03 11:21:06 2013 +0200

@@ -24,8 +24,7 @@

#include "internal.h"

~~-#include "purple.h"~~

~~-#include "prpl.h"~~

+#include "debug.h"

#include "protocol.h"

#include "mxit.h"

~~--- a/libpurple/protocols/mxit/mxit.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/mxit.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,10 +23,9 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

~~-#include "notify.h"~~

~~-#include "plugin.h"~~

+#include "internal.h"

+#include "debug.h"

+#include "accountopt.h"

#include "version.h"

#include "mxit.h"

@@ -650,6 +649,7 @@

return m;

}

/*------------------------------------------------------------------------

* Return Chat-room default settings.

~~--- a/libpurple/protocols/mxit/profile.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/profile.c Wed Apr 03 11:21:06 2013 +0200

@@ -26,8 +26,7 @@

#define _XOPEN_SOURCE

#include <time.h>

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

#include "mxit.h"

#include "profile.h"

~~--- a/libpurple/protocols/mxit/profile.h Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/profile.h Wed Apr 03 11:21:06 2013 +0200

@@ -26,8 +26,6 @@

#ifndef _MXIT_PROFILE_H_

#define _MXIT_PROFILE_H_

~~-#include <glib.h>~~

/* MXit relationship status types */

#define MXIT_RELATIONSHIP_UNKNOWN 0

@@ -61,7 +59,7 @@

char aboutme[513]; /* about me */

int relationship; /* relationship status */

~~- int flags; /* user's profile flags */~~

+ gint64 flags; /* user's profile flags */

gint64 lastonline; /* user's last-online timestamp */

};

~~--- a/libpurple/protocols/mxit/protocol.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/protocol.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,9 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

+#include "version.h"

#include "protocol.h"

#include "mxit.h"

@@ -37,6 +38,7 @@

#include "login.h"

#include "formcmds.h"

#include "http.h"

+#include "cipher.h"

#include "voicevideo.h"

@@ -98,26 +100,27 @@

void dump_bytes( struct MXitSession* session, const char* buf, int len )

{

~~- char msg[( len * 3 ) + 1];~~

~~- int i;~~

~~- memset( msg, 0x00, sizeof( msg ) );~~

+ char* msg = g_malloc0( len + 1 );

+ int i;

for ( i = 0; i < len; i++ ) {

~~- if ( buf[i] == CP_REC_TERM ) /* record terminator */~~

+ char ch = buf[i];

+ if ( ch == CP_REC_TERM ) /* record terminator */

msg[i] = '!';

~~- else if ( buf[i] == CP_FLD_TERM ) /* field terminator */~~

+ else if ( ch == CP_FLD_TERM ) /* field terminator */

msg[i] = '^';

~~- else if ( buf[i] == CP_PKT_TERM ) /* packet terminator */~~

+ else if ( ch == CP_PKT_TERM ) /* packet terminator */

msg[i] = '@';

~~- else if ( buf[i] < 0x20 )~~

+ else if ( ( ch < 0x20 ) || ( ch > 0x7E ) ) /* non-printable character */

msg[i] = '_';

else

~~- msg[i] = buf[i];~~

+ msg[i] = ch;

}

purple_debug_info( MXIT_PLUGIN_ID, "DUMP: '%s'\n", msg );

+ g_free( msg );

}

@@ -461,23 +464,23 @@

packet->headerlen = 0;

/* create generic packet header */

~~- hlen = snprintf( header, sizeof( header ), "id=%s%c", purple_account_get_username( session->acc ), CP_REC_TERM ); /* client mxitid */~~

+ hlen = g_snprintf( header, sizeof( header ), "id=%s%c", purple_account_get_username( session->acc ), CP_REC_TERM ); /* client mxitid */

if ( session->http ) {

/* http connection only */

~~- hlen += snprintf( header + hlen, sizeof( header ) - hlen, "s=" );~~

+ hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "s=" );

if ( session->http_sesid > 0 ) {

~~- hlen += snprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_sesid, CP_FLD_TERM ); /* http session id */~~

+ hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_sesid, CP_FLD_TERM ); /* http session id */

}

session->http_seqno++;

~~- hlen += snprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_seqno, CP_REC_TERM ); /* http request sequence id */~~

+ hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "%u%c", session->http_seqno, CP_REC_TERM ); /* http request sequence id */

}

~~- hlen += snprintf( header + hlen, sizeof( header ) - hlen, "cm=%i%c", cmd, CP_REC_TERM ); /* packet command */~~

+ hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "cm=%i%c", cmd, CP_REC_TERM ); /* packet command */

if ( !session->http ) {

/* socket connection only */

~~- packet->headerlen = snprintf( packet->header, sizeof( packet->header ), "ln=%i%c", ( datalen + hlen ), CP_REC_TERM ); /* packet length */~~

+ packet->headerlen = g_snprintf( packet->header, sizeof( packet->header ), "ln=%i%c", ( datalen + hlen ), CP_REC_TERM ); /* packet length */

}

/* copy the header to packet */

@@ -611,7 +614,6 @@

struct MXitSession* session = (struct MXitSession*) user_data;

gboolean poll = FALSE;

gint64 now = mxit_now_milli();

~~- int polldiff;~~

gint64 rxdiff;

if ( !( session->flags & MXIT_FLAG_LOGGEDIN ) ) {

@@ -621,7 +623,6 @@

/* calculate the time differences */

rxdiff = now - session->last_rx;

~~- polldiff = now - session->http_last_poll;~~

if ( rxdiff < MXIT_HTTP_POLL_MIN ) {

/* we received some reply a few moments ago, so reset the poll interval */

@@ -638,7 +639,7 @@

}

/* debugging */

~~- //purple_debug_info( MXIT_PLUGIN_ID, "POLL TIMER: %i (%i,%i)\n", session->http_interval, rxdiff, polldiff );~~

+ //purple_debug_info( MXIT_PLUGIN_ID, "POLL TIMER: %i (%i)\n", session->http_interval, rxdiff );

if ( poll ) {

/* send poll request */

@@ -716,7 +717,7 @@

clientVersion = g_strdup_printf( "%c-%i.%i.%i-%s-%s", MXIT_CP_DISTCODE, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION, MXIT_CP_ARCH, MXIT_CP_PLATFORM );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%s%c%i%c%s%c" /* "ms"=password\1version\1maxreplyLen\1name\1 */

"%s%c%i%c%s%c%s%c" /* dateOfBirth\1gender\1location\1capabilities\1 */

"%s%c%i%c%s%c%s" /* dc\1features\1dialingcode\1locale */

@@ -760,7 +761,7 @@

clientVersion = g_strdup_printf( "%c-%i.%i.%i-%s-%s", MXIT_CP_DISTCODE, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION, MXIT_CP_ARCH, MXIT_CP_PLATFORM );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%s%c%i%c" /* "ms"=password\1version\1getContacts\1 */

"%s%c%s%c%i%c" /* capabilities\1dc\1features\1 */

"%s%c%s%c" /* dialingcode\1locale\1 */

@@ -774,7 +775,7 @@

/* include "custom resource" information */

splashId = splash_current( session );

if ( splashId != NULL )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%ccr=%s", CP_REC_TERM, splashId );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%ccr=%s", CP_REC_TERM, splashId );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_LOGIN );

@@ -804,7 +805,7 @@

markuped_msg = g_strdup( msg );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%s%c%i%c%i", /* "ms"=jid\1msg\1type\1flags */

to, CP_FLD_TERM, markuped_msg, CP_FLD_TERM, msgtype, CP_FLD_TERM, CP_MSG_MARKUP | CP_MSG_EMOTICON

);

@@ -831,14 +832,14 @@

int datalen;

unsigned int i;

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms="mxitid\1nr_attributes */

( username ? username : "" ), CP_FLD_TERM, nr_attrib

);

/* add attributes */

for ( i = 0; i < nr_attrib; i++ )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_EXTPROFILE_GET );

@@ -864,7 +865,7 @@

parts = g_strsplit( attributes, "\01", 1 + ( nr_attrib * 3 ) );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms"=password\1nr_attibutes */

( password ) ? password : "", CP_FLD_TERM, nr_attrib

);

@@ -876,7 +877,7 @@

g_strfreev( parts );

return;

}

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen,~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen,

"%c%s%c%s%c%s", /* \1name\1type\1value */

CP_FLD_TERM, parts[i], CP_FLD_TERM, parts[i + 1], CP_FLD_TERM, parts[i + 2] );

}

@@ -904,13 +905,13 @@

unsigned int i;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%i%c%s%c%i%c%i%c%i", /* inputType \1 input \1 maxSuggestions \1 startIndex \1 numAttributes \1 name0 \1 name1 ... \1 nameN */

CP_SUGGEST_FRIENDS, CP_FLD_TERM, "", CP_FLD_TERM, max, CP_FLD_TERM, 0, CP_FLD_TERM, nr_attrib );

/* add attributes */

for ( i = 0; i < nr_attrib; i++ )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_SUGGESTCONTACTS );

@@ -933,13 +934,13 @@

unsigned int i;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%i%c%s%c%i%c%i%c%i", /* inputType \1 input \1 maxSuggestions \1 startIndex \1 numAttributes \1 name0 \1 name1 ... \1 nameN */

CP_SUGGEST_SEARCH, CP_FLD_TERM, text, CP_FLD_TERM, max, CP_FLD_TERM, 0, CP_FLD_TERM, nr_attrib );

/* add attributes */

for ( i = 0; i < nr_attrib; i++ )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, attribute[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_SUGGESTCONTACTS );

@@ -959,14 +960,14 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%i%c", /* "ms"=show\1status */

presence, CP_FLD_TERM

);

/* append status message (if one is set) */

if ( statusmsg )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%s", statusmsg );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%s", statusmsg );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_STATUS );

@@ -985,7 +986,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%i", /* "ms"=mood */

mood

);

@@ -1011,7 +1012,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%s%c%s%c%i%c%s%c%i", /* "ms"=group \1 username \1 alias \1 type \1 msg \1 isuserid */

groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias,

CP_FLD_TERM, MXIT_TYPE_MXIT, CP_FLD_TERM,

@@ -1036,7 +1037,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s", /* "ms"=username */

username

);

@@ -1059,7 +1060,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%s%c%s", /* "ms"=username\1group\1alias */

username, CP_FLD_TERM, "", CP_FLD_TERM, alias

);

@@ -1082,14 +1083,14 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s", /* "ms"=username */

username

);

/* append reason (if one is set) */

if ( reason )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, reason );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, reason );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_DENY );

@@ -1110,7 +1111,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%s%c%s", /* "ms"=groupname\1username\1alias */

groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias

);

@@ -1132,7 +1133,7 @@

int datalen;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s", /* "ms"=splashId */

splashid

);

@@ -1158,7 +1159,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_msgevent: to=%s id=%s event=%i\n", to, id, event );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%s%c%i", /* "ms"=contactAddress \1 id \1 event */

to, CP_FLD_TERM, id, CP_FLD_TERM, event

);

@@ -1183,14 +1184,14 @@

int i;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms"=roomname\1nr_jids\1jid0\1..\1jidN */

groupname, CP_FLD_TERM, nr_usernames

);

/* add usernames */

for ( i = 0; i < nr_usernames; i++ )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_GRPCHAT_CREATE );

@@ -1212,14 +1213,14 @@

int i;

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ),~~

+ datalen = g_snprintf( data, sizeof( data ),

"ms=%s%c%i", /* "ms"=roomid\1nr_jids\1jid0\1..\1jidN */

roomid, CP_FLD_TERM, nr_usernames

);

/* add usernames */

for ( i = 0; i < nr_usernames; i++ )

~~- datalen += snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );~~

+ datalen += g_snprintf( data + datalen, sizeof( data ) - datalen, "%c%s", CP_FLD_TERM, usernames[i] );

/* queue packet for transmission */

mxit_queue_packet( session, data, datalen, CP_CMD_GRPCHAT_INVITE );

@@ -1245,7 +1246,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "SENDING FILE '%s' of %i bytes to user '%s'\n", filename, buflen, username );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = g_snprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1281,7 +1282,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_reject\n" );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = g_snprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1319,7 +1320,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_accept\n" );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = g_snprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1355,7 +1356,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_received\n" );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = g_snprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1392,7 +1393,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_set_avatar: %i bytes\n", avatarlen );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = g_snprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1431,7 +1432,7 @@

purple_debug_info( MXIT_PLUGIN_ID, "mxit_get_avatar: %s\n", mxitId );

/* convert the packet to a byte stream */

~~- datalen = snprintf( data, sizeof( data ), "ms=" );~~

+ datalen = g_snprintf( data, sizeof( data ), "ms=" );

/* map chunk header over data buffer */

chunk = &data[datalen];

@@ -1878,11 +1879,11 @@

}

else if ( strcmp( CP_PROFILE_FLAGS, fname ) == 0 ) {

/* profile flags */

~~- profile->flags = strtoll( fvalue, NULL, 10 );~~

+ profile->flags = g_ascii_strtoll( fvalue, NULL, 10 );

}

else if ( strcmp( CP_PROFILE_LASTSEEN, fname ) == 0 ) {

/* last seen online */

~~- profile->lastonline = strtoll( fvalue, NULL, 10 );~~

+ profile->lastonline = g_ascii_strtoll( fvalue, NULL, 10 );

}

else if ( strcmp( CP_PROFILE_WHEREAMI, fname ) == 0 ) {

/* where am I */

@@ -2061,7 +2062,7 @@

int event;

~~- * contactAddress \1 dateTime \1 id \1 event~~

+ * contactAddress \1 dateTime \1 id \1 event

/* strip off dummy domain */

@@ -2880,7 +2881,7 @@

/* cancel all outstanding async calls */

while ( session->async_calls ) {

purple_util_fetch_url_cancel( session->async_calls->data );

~~- session->async_calls = g_slist_delete_link(session->async_calls, session->async_calls);~~

+ session->async_calls = g_slist_delete_link( session->async_calls, session->async_calls );

}

/* remove the input cb function */

~~--- a/libpurple/protocols/mxit/roster.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/roster.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,8 +23,8 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "internal.h"~~

~~-#include "purple.h"~~

+#include "internal.h"

+#include "debug.h"

#include "protocol.h"

#include "mxit.h"

@@ -83,7 +83,7 @@

/* add Mood option */

type = purple_status_type_new_with_attrs( PURPLE_STATUS_MOOD, "mood", NULL, FALSE, TRUE, TRUE,

~~- PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new( PURPLE_TYPE_STRING ),~~

+ PURPLE_MOOD_NAME, _( "Mood Name" ), purple_value_new( PURPLE_TYPE_STRING ),

NULL );

statuslist = g_list_append( statuslist, type );

@@ -183,7 +183,7 @@

* @param account The MXit account object

~~-PurpleMood* mxit_get_moods(PurpleAccount *account)~~

+PurpleMood* mxit_get_moods( PurpleAccount *account )

{

return mxit_moods;

}

@@ -672,7 +672,7 @@

{

struct contact* con = NULL;

struct contact* match = NULL;

~~- int i;~~

+ unsigned int i;

/* run through all the invites and try and find the match */

for ( i = 0; i < g_list_length( session->invites ); i++ ) {

~~--- a/libpurple/protocols/mxit/roster.h Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/roster.h Wed Apr 03 11:21:06 2013 +0200

@@ -153,7 +153,7 @@

void mxit_buddy_alias( PurpleConnection* gc, const char* who, const char* alias );

void mxit_buddy_group( PurpleConnection* gc, const char* who, const char* old_group, const char* new_group );

void mxit_rename_group( PurpleConnection* gc, const char* old_name, PurpleGroup* group, GList* moved_buddies );

~~-PurpleMood* mxit_get_moods(PurpleAccount *account);~~

+PurpleMood* mxit_get_moods( PurpleAccount *account );

#endif /* _MXIT_ROSTER_H_ */

~~--- a/libpurple/protocols/mxit/splashscreen.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/splashscreen.c Wed Apr 03 11:21:06 2013 +0200

@@ -24,9 +24,9 @@

#include "internal.h"

~~-#include "purple.h"~~

+#include "debug.h"

#include "imgstore.h"

+#include "request.h"

#include "protocol.h"

#include "mxit.h"

~~--- a/libpurple/protocols/mxit/voicevideo.c Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/voicevideo.c Wed Apr 03 11:21:06 2013 +0200

@@ -23,7 +23,8 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

~~-#include "purple.h"~~

+#include "internal.h"

#include "mxit.h"

#include "roster.h"

#include "voicevideo.h"

@@ -196,7 +197,7 @@

g_signal_connect(G_OBJECT(media), "state-changed", G_CALLBACK(mxit_state_changed_cb), NULL);

/* initiate audio session */

~~- if ((type & PURPLE_MEDIA_AUDIO) &&~~

+ if ((type & PURPLE_MEDIA_AUDIO) &&

(!purple_media_add_stream(media, "audio", who, PURPLE_MEDIA_AUDIO, TRUE, transmitter, 0, NULL))) {

purple_media_end(media, NULL, NULL);

return FALSE;

~~--- a/libpurple/protocols/mxit/voicevideo.h Wed Mar 27 01:37:02 2013 +0200~~

+++ b/libpurple/protocols/mxit/voicevideo.h Wed Apr 03 11:21:06 2013 +0200

@@ -26,16 +26,11 @@

#ifndef _MXIT_VOICEVICEO_H_

#define _MXIT_VOICEVIDEO_H_

~~-#include "media.h"~~

#undef MXIT_DEV_VV

gboolean mxit_audio_enabled(void);

gboolean mxit_video_enabled(void);

PurpleMediaCaps mxit_media_caps(PurpleAccount* account, const char* who);

gboolean mxit_media_initiate(PurpleAccount* account, const char* who, PurpleMediaSessionType type);

#endif /* _MXIT_VOICEVIDEO_H_ */