pidgin/android/libpurple2

Merge with release-2.x.y (resolved various conflicts in mxit)

2013-04-02, Daniel Atallah
20d3040431eb
Parents 12ec050117c6d91084abb15c
Children 368feedc80cf
Merge with release-2.x.y (resolved various conflicts in mxit)
14 files changed, 91 insertions(+), 77 deletions(-)
  • +4 -0
    ChangeLog
  • +2 -2
    libpurple/plugins/ssl/ssl-nss.c
  • +1 -1
    libpurple/protocols/irc/Makefile.am
  • +1 -1
    libpurple/protocols/mxit/actions.c
  • +24 -14
    libpurple/protocols/mxit/filexfer.c
  • +2 -2
    libpurple/protocols/mxit/formcmds.c
  • +1 -1
    libpurple/protocols/mxit/login.c
  • +2 -2
    libpurple/protocols/mxit/markup.c
  • +1 -1
    libpurple/protocols/mxit/profile.h
  • +48 -48
    libpurple/protocols/mxit/protocol.c
  • +2 -2
    libpurple/protocols/mxit/roster.c
  • +1 -1
    libpurple/protocols/mxit/roster.h
  • +1 -1
    libpurple/protocols/mxit/voicevideo.c
  • +1 -1
    libpurple/win32/global.mak
    • --- a/ChangeLog Mon Apr 01 18:03:03 2013 -0400
    +++ b/ChangeLog Tue Apr 02 09:20:41 2013 -0400
    @@ -57,6 +57,10 @@
    * The Offline Message Emulation plugin now adds a note that the message
    was an offline message. (Flavius Anton) (#2497)
    + Windows-Specific Changes:
    + * Updates to dependencies:
    + * NSS 3.14.3 and NSPR 4.9.5
    +
    version 2.10.7 (02/13/2013):
    Alien hatchery:
    * No changes
    --- a/libpurple/plugins/ssl/ssl-nss.c Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/plugins/ssl/ssl-nss.c Tue Apr 02 09:20:41 2013 -0400
    @@ -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/irc/Makefile.am Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/irc/Makefile.am Tue Apr 02 09:20:41 2013 -0400
    @@ -27,7 +27,7 @@
    st =
    pkg_LTLIBRARIES = libirc.la
    libirc_la_SOURCES = $(IRCSOURCES)
    -libirc_la_LIBADD = $(GLIB_LIBS)
    +libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS)
    endif
    --- a/libpurple/protocols/mxit/actions.c Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/actions.c Tue Apr 02 09:20:41 2013 -0400
    @@ -186,7 +186,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/filexfer.c Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/filexfer.c Tue Apr 02 09:20:41 2013 -0400
    @@ -153,7 +153,6 @@
    {
    goffset filesize;
    unsigned char* buffer;
    - int size;
    int wrote;
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_xfer_start\n" );
    @@ -166,12 +165,17 @@
    */
    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 +440,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 Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/formcmds.c Tue Apr 02 09:20:41 2013 -0400
    @@ -478,7 +478,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.
    @@ -533,7 +533,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/login.c Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/login.c Tue Apr 02 09:20:41 2013 -0400
    @@ -58,7 +58,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 Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/markup.c Tue Apr 02 09:20:41 2013 -0400
    @@ -392,7 +392,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 );
    @@ -411,7 +411,7 @@
    g_string_insert( mx->msg, start, tag );
    }
    - g_free(ii);
    + g_free( ii );
    }
    }
    --- a/libpurple/protocols/mxit/profile.h Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/profile.h Tue Apr 02 09:20:41 2013 -0400
    @@ -61,7 +61,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 Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/protocol.c Tue Apr 02 09:20:41 2013 -0400
    @@ -38,6 +38,7 @@
    #include "login.h"
    #include "formcmds.h"
    #include "http.h"
    +#include "cipher.h"
    #include "voicevideo.h"
    @@ -462,23 +463,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 msisdn */
    + 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 += sprintf( header + hlen, "s=" );
    + hlen += g_snprintf( header + hlen, sizeof( header ) - hlen, "s=" );
    if ( session->http_sesid > 0 ) {
    - hlen += sprintf( 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 += sprintf( 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 += sprintf( 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 += sprintf( 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 */
    @@ -612,7 +613,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 ) ) {
    @@ -622,7 +622,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 */
    @@ -639,7 +638,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 */
    @@ -717,7 +716,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 */
    @@ -761,7 +760,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 */
    @@ -775,7 +774,7 @@
    /* include "custom resource" information */
    splashId = splash_current( session );
    if ( splashId != NULL )
    - datalen += sprintf( 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 );
    @@ -805,7 +804,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
    );
    @@ -832,14 +831,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 += sprintf( 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 );
    @@ -865,7 +864,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
    );
    @@ -877,7 +876,8 @@
    g_strfreev( parts );
    return;
    }
    - datalen += sprintf( data + datalen, "%c%s%c%s%c%s", /* \1name\1type\1value */
    + 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 +904,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 += sprintf( 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 +933,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 += sprintf( 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 +959,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 += sprintf( 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 +985,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 +1011,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 +1036,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 +1059,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 +1082,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 += sprintf( 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 +1110,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 +1132,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 +1158,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 +1183,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 += sprintf( 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 +1212,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 += sprintf( 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 +1245,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 = sprintf( data, "ms=" );
    + datalen = g_snprintf( data, sizeof( data ), "ms=" );
    /* map chunk header over data buffer */
    chunk = &data[datalen];
    @@ -1281,7 +1281,7 @@
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_reject\n" );
    /* convert the packet to a byte stream */
    - datalen = sprintf( data, "ms=" );
    + datalen = g_snprintf( data, sizeof( data ), "ms=" );
    /* map chunk header over data buffer */
    chunk = &data[datalen];
    @@ -1319,7 +1319,7 @@
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_accept\n" );
    /* convert the packet to a byte stream */
    - datalen = sprintf( data, "ms=" );
    + datalen = g_snprintf( data, sizeof( data ), "ms=" );
    /* map chunk header over data buffer */
    chunk = &data[datalen];
    @@ -1355,7 +1355,7 @@
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_received\n" );
    /* convert the packet to a byte stream */
    - datalen = sprintf( data, "ms=" );
    + datalen = g_snprintf( data, sizeof( data ), "ms=" );
    /* map chunk header over data buffer */
    chunk = &data[datalen];
    @@ -1392,7 +1392,7 @@
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_set_avatar: %i bytes\n", avatarlen );
    /* convert the packet to a byte stream */
    - datalen = sprintf( data, "ms=" );
    + datalen = g_snprintf( data, sizeof( data ), "ms=" );
    /* map chunk header over data buffer */
    chunk = &data[datalen];
    @@ -1431,7 +1431,7 @@
    purple_debug_info( MXIT_PLUGIN_ID, "mxit_get_avatar: %s\n", mxitId );
    /* convert the packet to a byte stream */
    - datalen = sprintf( data, "ms=" );
    + datalen = g_snprintf( data, sizeof( data ), "ms=" );
    /* map chunk header over data buffer */
    chunk = &data[datalen];
    @@ -1878,11 +1878,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 +2061,7 @@
    int event;
    /*
    - * contactAddress \1 dateTime \1 id \1 event
    + * contactAddress \1 dateTime \1 id \1 event
    */
    /* strip off dummy domain */
    @@ -2450,12 +2450,12 @@
    return 0;
    }
    else {
    - snprintf( errmsg, sizeof( errmsg ), _( "Login error: %s (%i)" ), errdesc, packet->errcode );
    + g_snprintf( errmsg, sizeof( errmsg ), _( "Login error: %s (%i)" ), errdesc, packet->errcode );
    purple_connection_error( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, errmsg );
    return -1;
    }
    case CP_CMD_LOGOUT :
    - snprintf( errmsg, sizeof( errmsg ), _( "Logout error: %s (%i)" ), errdesc, packet->errcode );
    + g_snprintf( errmsg, sizeof( errmsg ), _( "Logout error: %s (%i)" ), errdesc, packet->errcode );
    purple_connection_error( session->con, PURPLE_CONNECTION_ERROR_NAME_IN_USE, _( errmsg ) );
    return -1;
    case CP_CMD_CONTACT :
    @@ -2880,7 +2880,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 Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/roster.c Tue Apr 02 09:20:41 2013 -0400
    @@ -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;
    }
    --- a/libpurple/protocols/mxit/roster.h Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/roster.h Tue Apr 02 09:20:41 2013 -0400
    @@ -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/voicevideo.c Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/protocols/mxit/voicevideo.c Tue Apr 02 09:20:41 2013 -0400
    @@ -196,7 +196,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/win32/global.mak Mon Apr 01 18:03:03 2013 -0400
    +++ b/libpurple/win32/global.mak Tue Apr 02 09:20:41 2013 -0400
    @@ -17,7 +17,7 @@
    BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
    LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.0
    MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
    -NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.13.6-nspr-4.9.2
    +NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.14.3-nspr-4.9.5
    PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
    SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
    TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5