--- a/ChangeLog	Thu Dec 06 20:22:33 2007 +0000
+++ b/ChangeLog	Fri Dec 07 05:29:45 2007 +0000
@@ -1,3 +1,11 @@
+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
+
 2007-12-06  Damien Carbery <[email protected]>
 
 	* base-specs/java-access-bridge.spec: Bump to 1.21.1.

--- a/SUNWgnome-im-client.spec	Thu Dec 06 20:22:33 2007 +0000
+++ b/SUNWgnome-im-client.spec	Fri Dec 07 05:29:45 2007 +0000
@@ -159,22 +159,19 @@
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/apps
-%{_datadir}/icons/hicolor/16x16/apps/pidgin.png
+%{_datadir}/icons/hicolor/16x16/apps/pidgin.*
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22/apps
-%{_datadir}/icons/hicolor/22x22/apps/pidgin.png
+%{_datadir}/icons/hicolor/22x22/apps/pidgin.*
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24/apps
-%{_datadir}/icons/hicolor/24x24/apps/pidgin.png
+%{_datadir}/icons/hicolor/24x24/apps/pidgin.*
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps
-%{_datadir}/icons/hicolor/32x32/apps/pidgin.png
+%{_datadir}/icons/hicolor/32x32/apps/pidgin.*
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps
-%{_datadir}/icons/hicolor/48x48/apps/pidgin.png
-%dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable
-%dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable/apps
-%{_datadir}/icons/hicolor/scalable/apps/pidgin.svg
+%{_datadir}/icons/hicolor/48x48/apps/pidgin.*
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/man1
 %{_mandir}/man1/*
@@ -205,6 +202,8 @@
 %endif
 
 %changelog
+* Thu Dec 06 2007  - [email protected]
+- %files changed to bump to pidgin 2.3.0
 * Tue Nov 16 2007  - [email protected]
 - Use SGML man page instead of the one from community
 * Tue Nov 06 2007  - [email protected]

--- a/base-specs/pidgin.spec	Thu Dec 06 20:22:33 2007 +0000
+++ b/base-specs/pidgin.spec	Fri Dec 07 05:29:45 2007 +0000
@@ -11,7 +11,7 @@
 #
 %include l10n.inc
 Name:		pidgin
-Version:	2.2.2
+Version:	2.3.0
 Release:        1
 License:	GPL
 Group:		Applications/Internet
@@ -151,6 +151,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Dec 06 2007  - [email protected]
+  bump to pidgin 2.3.0
+
 * Tue Nov 06 2007  - [email protected]
   bump to pidgin 2.2.2
 

--- a/patches/pidgin-01-gnome-keyring.diff	Thu Dec 06 20:22:33 2007 +0000
+++ b/patches/pidgin-01-gnome-keyring.diff	Fri Dec 07 05:29:45 2007 +0000
@@ -15,11 +15,11 @@
 +	$(GAIM_KEYRING_CFLAGS) \
  	$(LIBXML_CFLAGS) \
  	$(LIBNM_CFLAGS)
---- 2.0b4-my/libpurple/account.c	2006-10-19 01:38:16.000000000 +0800
-+++ 2.0b4-my2/libpurple/account.c	2006-11-13 18:26:19.409755000 +0800
-@@ -40,6 +40,13 @@
- #include "util.h"
- #include "xmlnode.h"
+--- pidgin-2.3.0/libpurple/account.c	2007-11-25 03:05:51.000000000 +0800
++++ pidgin-2.3.0-my/libpurple/account.c	2007-12-06 11:35:30.201708000 +0800
+@@ -49,6 +49,13 @@
+ #define PURPLE_ACCOUNT_GET_PRIVATE(account) \
+ 	((PurpleAccountPrivate *) (account->priv))
  
 +#ifdef GAIM_ENABLE_KEYRING
 +#include <gnome-keyring.h>
@@ -31,7 +31,7 @@
  /* TODO: Should use PurpleValue instead of this?  What about "ui"? */
  typedef struct
  {
-@@ -324,8 +331,13 @@
+@@ -363,8 +370,13 @@
  	if (purple_account_get_remember_password(account) &&
  		((tmp = purple_account_get_password(account)) != NULL))
  	{
@@ -45,7 +45,7 @@
  	}
  
  	if ((tmp = purple_account_get_alias(account)) != NULL)
-@@ -700,17 +712,30 @@
+@@ -778,17 +790,30 @@
  	}
  
  	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
@@ -87,9 +87,9 @@
  
  	/* Read the alias */
  	child = xmlnode_get_child(node, "alias");
-@@ -2448,3 +2473,61 @@
- 
- 	purple_signals_unregister_by_instance(purple_accounts_get_handle());
+@@ -2698,3 +2723,61 @@
+ 	purple_signals_disconnect_by_handle(handle);
+ 	purple_signals_unregister_by_instance(handle);
  }
 +
 +#ifdef GAIM_ENABLE_KEYRING

--- 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"