/pidgin/main: c5445f25f90f: Merge with release-2.x.y

Changeset: c5445f25f90f0a727748c708b67a69ef6d66d84f
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2014-11-13 01:06 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/c5445f25f90f

Description:

Merge with release-2.x.y

diffstat:

 libpurple/circularbuffer.c        |  4 ++--
 libpurple/plugins/signals-test.c  |  4 ++--
 libpurple/protocols/mxit/markup.c |  2 +-
 libpurple/upnp.c                  |  2 +-
 libpurple/util.c                  |  3 +--
 pidgin/gtkprivacy.c               |  2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diffs (93 lines):

diff --git a/libpurple/circularbuffer.c b/libpurple/circularbuffer.c
--- a/libpurple/circularbuffer.c
+++ b/libpurple/circularbuffer.c
@@ -104,7 +104,7 @@ purple_circular_buffer_real_grow(PurpleC
 
 	/* 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 @@ purple_circular_buffer_real_mark_read(Pu
 	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);
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -620,10 +620,10 @@ notify_email_cb(char *subject, char *fro
 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]);
 	}
 }
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
@@ -593,7 +593,7 @@ static void emoticon_returned(PurpleHttp
 	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 );
diff --git a/libpurple/upnp.c b/libpurple/upnp.c
--- a/libpurple/upnp.c
+++ b/libpurple/upnp.c
@@ -577,7 +577,7 @@ purple_upnp_discover_send_broadcast(UPnP
 			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;
 			}
diff --git a/libpurple/util.c b/libpurple/util.c
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -187,7 +187,7 @@ purple_base16_encode(const guchar *data,
 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 @@ purple_markup_strip_html(const char *str
 				 * 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. */
diff --git a/pidgin/gtkprivacy.c b/pidgin/gtkprivacy.c
--- a/pidgin/gtkprivacy.c
+++ b/pidgin/gtkprivacy.c
@@ -370,7 +370,7 @@ privacy_dialog_new(void)
 		                          _(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);