patches/pidgin-04-jabber-msg.diff
author rickju
Fri, 07 Dec 2007 05:29:45 +0000
changeset 11300 3060d2518108
parent 10139 c43026228546
child 11384 3f5d9a829ba8
permissions -rw-r--r--
2007-12-06 Rick Ju <[email protected]> * SUNWgnome-im-client.spec: * base-specs/pidgin.spec: * patches/pidgin-01-gnome-keyring.diff: * patches/pidgin-04-jabber-msg.diff: Bump to pidgin 2.3.0

--- pidgin-2.3.0/libpurple/protocols/jabber/jabber.c	2007-11-25 03:05:56.000000000 +0800
+++ pidgin-2.3.0-my/libpurple/protocols/jabber/jabber.c	2007-12-06 11:17:22.050609000 +0800
@@ -181,6 +181,8 @@
 {
 	PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 	char *msg = jabber_parse_error(js, packet, &reason);
+	if (!msg)
+		return;
 
 	purple_connection_error_reason (js->gc, reason, msg);
 
--- pidgin-2.3.0/libpurple/protocols/bonjour/jabber.c	2007-11-25 03:05:56.000000000 +0800
+++ pidgin-2.3.0-my/libpurple/protocols/bonjour/jabber.c	2007-12-06 11:18:26.006897000 +0800
@@ -33,6 +33,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#ifdef __sun
+#include <sys/sockio.h>
+#endif
+
 #include "internal.h"
 #include "network.h"
 #include "eventloop.h"