/pidgin/main: 7939026380e1: Fix build

Changeset: 7939026380e13938c717973ffd59f3e5ab780acc
Author:	 Tomasz Wasilczyk <[email protected]>
Date:	 2014-05-07 11:16 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/7939026380e1

Description:

Fix build

diffstat:

 libpurple/protocols/bonjour/jabber.c |  2 +-
 libpurple/protocols/oscar/userinfo.c |  8 ++++++--
 libpurple/stun.c                     |  2 +-
 libpurple/util.c                     |  2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diffs (54 lines):

diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -1185,7 +1185,7 @@ bonjour_jabber_close_conversation(Bonjou
 			/* Send the end of the stream to the other end of the conversation */
 			if (bconv->sent_stream_start == FULLY_SENT) {
 				size_t len = strlen(STREAM_END);
-				if (send(bconv->socket, STREAM_END, len, 0) != len) {
+				if (send(bconv->socket, STREAM_END, len, 0) != (gssize)len) {
 					purple_debug_error("bonjour",
 						"bonjour_jabber_close_conversation: "
 						"couldn't send data\n");
diff --git a/libpurple/protocols/oscar/userinfo.c b/libpurple/protocols/oscar/userinfo.c
--- a/libpurple/protocols/oscar/userinfo.c
+++ b/libpurple/protocols/oscar/userinfo.c
@@ -369,8 +369,12 @@ oscar_user_info_display_error(OscarData 
 	purple_notify_user_info_add_pair_plaintext(user_info, NULL, buf);
 	purple_notify_userinfo(od->gc, buddy, user_info, NULL, NULL);
 	purple_notify_user_info_destroy(user_info);
-	if (!purple_conv_present_error(buddy, purple_connection_get_account(od->gc), buf))
-		purple_notify_error(od->gc, NULL, buf, NULL);
+	if (!purple_conversation_present_error(buddy,
+		purple_connection_get_account(od->gc), buf))
+	{
+		purple_notify_error(od->gc, NULL, buf, NULL,
+			purple_request_cpar_from_connection(od->gc));
+	}
 	g_free(buf);
 }
 
diff --git a/libpurple/stun.c b/libpurple/stun.c
--- a/libpurple/stun.c
+++ b/libpurple/stun.c
@@ -137,7 +137,7 @@ static gboolean timeoutfunc(gpointer dat
 	sc->retry++;
 	if (sendto(sc->fd, sc->packet, sc->packetsize, 0,
 		(struct sockaddr *)&(sc->addr), sizeof(struct sockaddr_in)) !=
-		sc->packetsize)
+		(gssize)sc->packetsize)
 	{
 		purple_debug_warning("stun", "sendto failed\n");
 		return FALSE;
diff --git a/libpurple/util.c b/libpurple/util.c
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -3106,7 +3106,7 @@ purple_util_write_data_to_file_absolute(
 		return FALSE;
 	}
 	/* Use stat to be absolutely sure. */
-	if ((g_stat(filename_temp, &st) == -1) || (st.st_size != real_size))
+	if ((g_stat(filename_temp, &st) == -1) || (st.st_size != real_size)) {
 		purple_debug_error("util", "Error writing data to file %s: "
 			"couldn't g_stat file", filename_temp);
 		g_free(filename_temp);