pidgin/pidgin

Merge with release-2.x.y

2014-11-13, Elliott Sales de Andrade
c5445f25f90f
Parents 3ee545012e46a437550a9308
Children a728314b1306
Merge with release-2.x.y
6 files changed, 8 insertions(+), 9 deletions(-)
  • +2 -2
    libpurple/circularbuffer.c
  • +2 -2
    libpurple/plugins/signals-test.c
  • +1 -1
    libpurple/protocols/mxit/markup.c
  • +1 -1
    libpurple/upnp.c
  • +1 -2
    libpurple/util.c
  • +1 -1
    pidgin/gtkprivacy.c
    • --- a/libpurple/circularbuffer.c Wed Nov 12 03:59:11 2014 -0500
    +++ b/libpurple/circularbuffer.c Thu Nov 13 01:06:59 2014 -0500
    @@ -104,7 +104,7 @@
    /* If the fill pointer is wrapped to before the remove
    * pointer, we need to shift the data */
    - if(in_offset < out_offset
    + if (in_offset < out_offset
    || (in_offset == out_offset && priv->bufused > 0))
    {
    gsize shift_n = MIN(priv->buflen - start_buflen, in_offset);
    @@ -200,7 +200,7 @@
    priv->bufused -= len;
    /* wrap to the start if we're at the end */
    - if((gsize)(priv->output - priv->buffer) == priv->buflen)
    + if ((gsize)(priv->output - priv->buffer) == priv->buflen)
    priv->output = priv->buffer;
    obj = G_OBJECT(buffer);
    --- a/libpurple/plugins/signals-test.c Wed Nov 12 03:59:11 2014 -0500
    +++ b/libpurple/plugins/signals-test.c Thu Nov 13 01:06:59 2014 -0500
    @@ -620,10 +620,10 @@
    static void
    notify_emails_cb(char **subjects, char **froms, char **tos, char **urls, guint count) {
    guint i;
    - purple_debug_misc("signals test", "notify emails: count=%d\n", count);
    + purple_debug_misc("signals test", "notify emails: count=%u\n", count);
    for(i=0; i<count && i<5; i++) {
    if(subjects[i]==NULL || froms[i]==NULL || tos[i]==NULL || urls[i]==NULL) continue;
    - purple_debug_misc("signals test", "notify emails[%d]: subject=%s, from=%s, to=%s, url=%s\n",
    + purple_debug_misc("signals test", "notify emails[%u]: subject=%s, from=%s, to=%s, url=%s\n",
    i, subjects[i], froms[i], tos[i], urls[i]);
    }
    }
    --- a/libpurple/protocols/mxit/markup.c Wed Nov 12 03:59:11 2014 -0500
    +++ b/libpurple/protocols/mxit/markup.c Thu Nov 13 01:06:59 2014 -0500
    @@ -593,7 +593,7 @@
    purple_debug_info( MXIT_PLUGIN_ID, "read the length '%i'\n", em_size );
    #endif
    - if ( len - pos < em_size ) {
    + if ( len - pos < (gsize)em_size ) {
    /* not enough bytes left in data! */
    purple_debug_error( MXIT_PLUGIN_ID, "Invalid emoticon received from wapsite (data length too long)\n");
    g_free( em_id );
    --- a/libpurple/upnp.c Wed Nov 12 03:59:11 2014 -0500
    +++ b/libpurple/upnp.c Thu Nov 13 01:06:59 2014 -0500
    @@ -577,7 +577,7 @@
    gssize sent = sendto(dd->fd, sendMessage, totalSize, 0,
    (struct sockaddr*) &(dd->server),
    sizeof(struct sockaddr_in));
    - if(sent >= 0 && (gsize)sent == totalSize) {
    + if (sent >= 0 && (gsize)sent == totalSize) {
    sentSuccess = TRUE;
    break;
    }
    --- a/libpurple/util.c Wed Nov 12 03:59:11 2014 -0500
    +++ b/libpurple/util.c Thu Nov 13 01:06:59 2014 -0500
    @@ -187,7 +187,7 @@
    guchar *
    purple_base16_decode(const char *str, gsize *ret_len)
    {
    - int len, i, accumulator = 0;
    + gsize len, i, accumulator = 0;
    guchar *data;
    g_return_val_if_fail(str != NULL, NULL);
    @@ -2402,7 +2402,6 @@
    * address the link was pointing to. */
    else if (href != NULL && g_ascii_strncasecmp(str2 + i, "</a>", 4) == 0)
    {
    -
    size_t hrlen = strlen(href);
    /* Only insert the href if it's different from the CDATA. */
    --- a/pidgin/gtkprivacy.c Wed Nov 12 03:59:11 2014 -0500
    +++ b/pidgin/gtkprivacy.c Thu Nov 13 01:06:59 2014 -0500
    @@ -370,7 +370,7 @@
    _(menu_entries[i].text));
    if (menu_entries[i].type == purple_account_get_privacy_type(dialog->account))
    - selected = i;
    + selected = (gssize)i;
    }
    gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->type_menu), selected);