--- a/patches/pidgin-04-jabber-msg.diff	Thu Dec 06 20:22:33 2007 +0000
+++ b/patches/pidgin-04-jabber-msg.diff	Fri Dec 07 05:29:45 2007 +0000
@@ -1,11 +1,24 @@
---- gaim-ori/libpurple/protocols/jabber/jabber-ori.c	2007-03-07 12:16:24.828217000 +0800
-+++ gaim/libpurple/protocols/jabber/jabber.c	2007-03-07 12:16:34.984597000 +0800
-@@ -160,6 +160,8 @@
- static void jabber_stream_handle_error(JabberStream *js, xmlnode *packet)
+--- 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 @@
  {
- 	char *msg = jabber_parse_error(js, packet);
+ 	PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
+ 	char *msg = jabber_parse_error(js, packet, &reason);
 +	if (!msg)
-+	  return;
++		return;
+ 
+ 	purple_connection_error_reason (js->gc, reason, msg);
  
- 	purple_connection_error(js->gc, msg);
- 	g_free(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"