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