Clean up gnome-keyring patch a bit, kill references to gaim within the patch.

2 files changed, 42 insertions, 42 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index ef64df0..b2f09b5 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pidgin-gnome-keyring-1.patch 7453 RMD160 bc32f94cd28d67b48b837d0ce6ab8b58c7902070 SHA1 51a5d07eb061d985816b29cb776fb38823e34b5f SHA256 7cbd7a399e460bdacf9f7fc189ffb0f9ea2ea1a00a7e028e7b542a386900e267
+AUX pidgin-gnome-keyring-1.patch 7457 RMD160 0d8345675a073c8585bf0be7678f52d63d14ec95 SHA1 b3dd0d336e4773578cc6e20dc9b317b27f383077 SHA256 f56bc4a1a678ad749848108ecef76f4bb2b16501908197bb645518e1a3027619
 DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
 EBUILD pidgin-2.7.1-r1.ebuild 6339 RMD160 7f26bfb1a148bd846612ff8b6c1b7ae0f594d0d5 SHA1 317fc130adbf31bbb7e0b60654960a30ccef1a7f SHA256 8aa1047e40fc96b6011984e0e9576c68c2d62825b2a3a4daeb126aca2c44c292
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMRm0+AAoJEHy/RO9cNQiDfSAP/2bvX5Fn8X7fow4+uJHAU7kT
-mXpENarvg3EZ7Cdqedn7uP5Uk0wnsOP4llGnrlnnA+NLpnIkVyifUa31K7D/FXH1
-mZ5igWOo5inK3u49o3nteWRcvCRVeN6jImfxAIDYnW2CO1hqkiDUUZbgllsABfb2
-d/Q9X32BAerwNzN5stGtp88P04Rbw3UklKbm8OgkOGxpVIMbXLWgFAGD5Myz8afJ
-wNneXsMzEoj5N2Nw+AEJX/zSmOuwrICYvxKe2eqPMnrdehi7RhG3xK7IqgmsTVS5
-gosaZr07TpVZEdOVf2QHLHpVhKi/VmyDKa0by2dlDJtoSw1e2zTWGE9Q9YOjNWTv
-RijZZOh5UxHO+3fSSvI1k/mXBDZ3p1L89X+85mca+fWNKS0YA84ff4X7d7d5v2x4
-BOSWNICm6bLXgWgQA4ys7N4V7zs595A6sANFP/YmDv8wHyMbtQNoi3AGIo4gsfos
-uUN+BmvCKhV1rsNNJ/BIc2iqmb1v55zgjgwEvQXSaVFpEuTBTPnt+sNrltDXAd69
-ssWRdmkjIcx11scvsGe/gq2NovmE4JKU4sJFIikMX7z+B0qWUJyJZkOJK2/afqXU
-2fyZbzHLTgl3YdwHKLPtxWKnPGjHIEILK0KQ8ataRKX2OolJTZE+KOUzsQzJ4R7A
-XL7Abb/rywLz3GZ3Hg/T
-=Bf67
+iQIcBAEBAgAGBQJMRw3dAAoJEHy/RO9cNQiDpCcQAMWzgmQBjxrBHi3zIO7LsVeU
+so90AcMNIlJe6S3z37OMLs2q1NtuoT+yNuAsEeUzYi8CEDG71eE3WUcwaCVSoICK
+bXfTz2UxGeyC5o4sqn7/nAHXCVVeFLTFOP0r3oZTlYMp1udng++cuU+VBzn4p+iR
+2C4qc22UkRE8FdVzHjq0oNJYc+YFyvfQVhrxAKDbjYw2ta/mTXPFC1o0fJOg5bQx
+06DzsyoW0OFiKqqpqfOtYLLARVgrCGqe8IIM9PAG+4aN8zHAeDvYsdPfuIkWbRC2
+xo9qGjwCQhCKehIT1kmveAqW5hwWLnP/Uq0RzUBKdnMPterNmWB3Hc5mKl0Yr9hW
+nLQZJ0edeUwf6ZR0/3I2MQt42yLEHbUcB3qbyFu9e4TxK9xEq5R/cr/ZHE/u/Cn4
+50fsI4eceJcmiJNoIiMsga5RQjCjv9GRRWGADLxSdReIsx5CoyYIJISyAqis7nfh
+BFsy3IbR8Qq8jFPvBk2JklD+ei/EpQwV46/1+0xoX8CJGDV0fHyBMd8ude3IO+/2
+6IZj9N9qkd/haZ2zQstaqOn4oXeik0r1+n+Vavjms2jiBErbnHiyj3GYmDZebRjD
+rCOMchLMuEK7xjdfni6AYF3WDMy6tc25g7oddeGd/o3M9CK55v/Ot38ewsQ8GfOO
+WXKcXvF2ulACUXhAvM/8
+=zIWr
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-gnome-keyring-1.patch b/net-im/pidgin/files/pidgin-gnome-keyring-1.patch
index fc0e90f..fec338e 100644
--- a/net-im/pidgin/files/pidgin-gnome-keyring-1.patch
+++ b/net-im/pidgin/files/pidgin-gnome-keyring-1.patch
@@ -1,6 +1,6 @@
-diff -ur pidgin-2.7.1.orig//configure.ac pidgin-2.7.1//configure.ac
---- pidgin-2.7.1.orig//configure.ac	2010-05-29 21:23:56.000000000 -0400
-+++ pidgin-2.7.1//configure.ac	2010-07-20 23:25:59.520998076 -0400
+diff -ur pidgin-2.7.1.orig/configure.ac pidgin-2.7.1/configure.ac
+--- pidgin-2.7.1.orig/configure.ac	2010-05-29 21:23:56.000000000 -0400
++++ pidgin-2.7.1/configure.ac	2010-07-20 23:25:59.520998076 -0400
 @@ -2393,6 +2393,20 @@
  	LDFLAGS="$orig_LDFLAGS"
  fi
@@ -14,22 +14,22 @@ diff -ur pidgin-2.7.1.orig//configure.ac pidgin-2.7.1//configure.ac
 +                             [use gnome keyring for storing password [default=no]]),,
 +              enable_gnome_keyring=no)
 +if test "x$enable_gnome_keyring" = "xyes"; then
-+    PKG_CHECK_MODULES(GAIM_KEYRING,
++    PKG_CHECK_MODULES(PIDGIN_KEYRING,
 +                      gnome-keyring-1,
-+                      AC_DEFINE(GAIM_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
++                      AC_DEFINE(PIDGIN_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
 +fi
 +
  AC_MSG_CHECKING(for me pot o' gold)
  AC_MSG_RESULT(no)
  AC_CHECK_FUNCS(gethostid lrand48)
-diff -ur pidgin-2.7.1.orig//libpurple/Makefile.am pidgin-2.7.1//libpurple/Makefile.am
---- pidgin-2.7.1.orig//libpurple/Makefile.am	2010-05-29 21:23:57.000000000 -0400
-+++ pidgin-2.7.1//libpurple/Makefile.am	2010-07-20 23:25:59.529007791 -0400
+diff -ur pidgin-2.7.1.orig/libpurple/Makefile.am pidgin-2.7.1/libpurple/Makefile.am
+--- pidgin-2.7.1.orig/libpurple/Makefile.am	2010-05-29 21:23:57.000000000 -0400
++++ pidgin-2.7.1/libpurple/Makefile.am	2010-07-20 23:25:59.529007791 -0400
 @@ -307,6 +307,7 @@
  	$(DBUS_LIBS) \
  	$(GLIB_LIBS) \
  	$(LIBXML_LIBS) \
-+	$(GAIM_KEYRING_LIBS) \
++	$(PIDGIN_KEYRING_LIBS) \
  	$(NETWORKMANAGER_LIBS) \
  	$(INTLLIBS) \
  	$(FARSIGHT_LIBS) \
@@ -37,18 +37,18 @@ diff -ur pidgin-2.7.1.orig//libpurple/Makefile.am pidgin-2.7.1//libpurple/Makefi
  	$(GLIB_CFLAGS) \
  	$(DEBUG_CFLAGS) \
  	$(DBUS_CFLAGS) \
-+	$(GAIM_KEYRING_CFLAGS) \
++	$(PIDGIN_KEYRING_CFLAGS) \
  	$(LIBXML_CFLAGS) \
  	$(FARSIGHT_CFLAGS) \
  	$(GSTREAMER_CFLAGS) \
-diff -ur pidgin-2.7.1.orig//libpurple/account.c pidgin-2.7.1//libpurple/account.c
---- pidgin-2.7.1.orig//libpurple/account.c	2010-05-29 21:23:57.000000000 -0400
-+++ pidgin-2.7.1//libpurple/account.c	2010-07-20 23:25:59.528013217 -0400
+diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
+--- pidgin-2.7.1.orig/libpurple/account.c	2010-05-29 21:23:57.000000000 -0400
++++ pidgin-2.7.1/libpurple/account.c	2010-07-20 23:25:59.528013217 -0400
 @@ -49,6 +49,13 @@
  #define PURPLE_ACCOUNT_GET_PRIVATE(account) \
  	((PurpleAccountPrivate *) (account->priv))
  
-+#ifdef GAIM_ENABLE_KEYRING
++#ifdef PIDGIN_ENABLE_KEYRING
 +#include <gnome-keyring.h>
 +
 +static char * gaim_account_get_password_from_keyring (const char *_prpl, const char *_user);
@@ -62,7 +62,7 @@ diff -ur pidgin-2.7.1.orig//libpurple/account.c pidgin-2.7.1//libpurple/account.
  	if (purple_account_get_remember_password(account) &&
  		((tmp = purple_account_get_password(account)) != NULL))
  	{
-+#ifdef GAIM_ENABLE_KEYRING
++#ifdef PIDGIN_ENABLE_KEYRING
 +                gaim_account_set_password_in_keyring( purple_account_get_protocol_id(account),
 +                                          purple_account_get_username(account), tmp);
 +#else
@@ -88,7 +88,7 @@ diff -ur pidgin-2.7.1.orig//libpurple/account.c pidgin-2.7.1//libpurple/account.
 -		g_free(data);
 -	}
 +        gboolean got_pwd = FALSE;
-+#ifdef GAIM_ENABLE_KEYRING
++#ifdef PIDGIN_ENABLE_KEYRING
 +        data = gaim_account_get_password_from_keyring(protocol_id, name);
 +        if (data)
 +        {
@@ -119,7 +119,7 @@ diff -ur pidgin-2.7.1.orig//libpurple/account.c pidgin-2.7.1//libpurple/account.
  	purple_signals_unregister_by_instance(handle);
  }
 +
-+#ifdef GAIM_ENABLE_KEYRING
++#ifdef PIDGIN_ENABLE_KEYRING
 +static char *
 +gaim_account_get_password_from_keyring(const char *_prpl, const char *_user)
 +{
@@ -176,14 +176,14 @@ diff -ur pidgin-2.7.1.orig//libpurple/account.c pidgin-2.7.1//libpurple/account.
 +  return result == GNOME_KEYRING_RESULT_OK;
 +}
 +#endif
-diff -ur pidgin-2.7.1.orig//pidgin/Makefile.am pidgin-2.7.1//pidgin/Makefile.am
---- pidgin-2.7.1.orig//pidgin/Makefile.am	2010-05-29 21:24:00.000000000 -0400
-+++ pidgin-2.7.1//pidgin/Makefile.am	2010-07-20 23:25:59.530998309 -0400
+diff -ur pidgin-2.7.1.orig/pidgin/Makefile.am pidgin-2.7.1/pidgin/Makefile.am
+--- pidgin-2.7.1.orig/pidgin/Makefile.am	2010-05-29 21:24:00.000000000 -0400
++++ pidgin-2.7.1/pidgin/Makefile.am	2010-07-20 23:25:59.530998309 -0400
 @@ -161,6 +161,7 @@
  	$(GTKSPELL_LIBS) \
  	$(STARTUP_NOTIFICATION_LIBS) \
  	$(LIBXML_LIBS) \
-+	$(GAIM_KEYRING_LIBS) \
++	$(PIDGIN_KEYRING_LIBS) \
  	$(GTK_LIBS) \
  	$(top_builddir)/libpurple/libpurple.la
  
@@ -191,18 +191,18 @@ diff -ur pidgin-2.7.1.orig//pidgin/Makefile.am pidgin-2.7.1//pidgin/Makefile.am
  	$(GSTREAMER_CFLAGS) \
  	$(DEBUG_CFLAGS) \
  	$(GTK_CFLAGS) \
-+	$(GAIM_KEYRING_CFLAGS) \
++	$(PIDGIN_KEYRING_CFLAGS) \
  	$(DBUS_CFLAGS) \
  	$(GTKSPELL_CFLAGS) \
  	$(STARTUP_NOTIFICATION_CFLAGS) \
-diff -ur pidgin-2.7.1.orig//pidgin/gtkmain.c pidgin-2.7.1//pidgin/gtkmain.c
---- pidgin-2.7.1.orig//pidgin/gtkmain.c	2010-05-29 21:24:00.000000000 -0400
-+++ pidgin-2.7.1//pidgin/gtkmain.c	2010-07-20 23:25:59.529007791 -0400
+diff -ur pidgin-2.7.1.orig/pidgin/gtkmain.c pidgin-2.7.1/pidgin/gtkmain.c
+--- pidgin-2.7.1.orig/pidgin/gtkmain.c	2010-05-29 21:24:00.000000000 -0400
++++ pidgin-2.7.1/pidgin/gtkmain.c	2010-07-20 23:25:59.529007791 -0400
 @@ -70,6 +70,10 @@
  #include "pidginstock.h"
  #include "gtkwhiteboard.h"
  
-+#ifdef GAIM_ENABLE_KEYRING
++#ifdef PIDGIN_ENABLE_KEYRING
 +#include <gnome-keyring.h>
 +#endif
 +
@@ -213,7 +213,7 @@ diff -ur pidgin-2.7.1.orig//pidgin/gtkmain.c pidgin-2.7.1//pidgin/gtkmain.c
  	gtk_rc_add_default_file(search_path);
  	g_free(search_path);
  
-+#ifdef  GAIM_ENABLE_KEYRING
++#ifdef  PIDGIN_ENABLE_KEYRING
 +	GnomeKeyringResult rtn = gnome_keyring_unlock_sync(NULL, NULL);
 +	// if (rtn == GNOME_KEYRING_RESULT_DENIED)
 +	//   return 0;