soc.2008.masterpassword: a18fe1b4: Use better keyring IDs.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: a18fe1b48a51466593fbad7c704152e1fe1c61d2
Parent:   cbb869032aa6629619b29638b8eb0b2890f4948e
Author:   qulogic at pidgin.im
Date:     01/28/12 00:06:45
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/a18fe1b48a51466593fbad7c704152e1fe1c61d2

Changelog: 

Use better keyring IDs.

Changes against parent cbb869032aa6629619b29638b8eb0b2890f4948e

  patched  libpurple/keyring.h
  patched  libpurple/plugins/keyrings/gnomekeyring.c
  patched  libpurple/plugins/keyrings/internalkeyring.c
  patched  libpurple/plugins/keyrings/kwallet.cpp

-------------- next part --------------
============================================================
--- libpurple/keyring.h	cf2278c01833a108cd3ed6cedf0720eb4ae1bd50
+++ libpurple/keyring.h	5ae38c9a270934fc6435e9c4029f097874dd5cfe
@@ -36,7 +36,7 @@
 /**
  * Default keyring
  */
-#define PURPLE_DEFAULT_KEYRING "core-scrouaf-internalkeyring"
+#define PURPLE_DEFAULT_KEYRING "keyring-internal"
 
 /*******************************************************/
 /** @name data structures and types                    */
============================================================
--- libpurple/plugins/keyrings/gnomekeyring.c	c8006213b62527d02daba17402d299a6e2c5172c
+++ libpurple/plugins/keyrings/gnomekeyring.c	44de73c9c334f808724f2c57981204183f476543
@@ -40,8 +40,8 @@
 #define GNOMEKEYRING_NAME        N_("GNOME-Keyring")
 #define GNOMEKEYRING_VERSION     "0.3b"
 #define GNOMEKEYRING_DESCRIPTION N_("This plugin will store passwords in GNOME Keyring.")
-#define	GNOMEKEYRING_AUTHOR      "Scrouaf (scrouaf[at]soc.pidgin.im)"
-#define GNOMEKEYRING_ID          "core-scrouaf-gnomekeyring"
+#define GNOMEKEYRING_AUTHOR      "Scrouaf (scrouaf[at]soc.pidgin.im)"
+#define GNOMEKEYRING_ID          "keyring-gnomekeyring"
 
 #define ERR_GNOMEKEYRINGPLUGIN 	gkp_error_domain()
 
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c	834055ea164fa2432a1568b853b835a7d4a9cc9a
+++ libpurple/plugins/keyrings/internalkeyring.c	2b80af7a4651ea6aab4055356adedb005dbb3556
@@ -37,7 +37,7 @@
 #define INTERNALKEYRING_NAME        N_("Internal keyring")
 #define INTERNALKEYRING_VERSION     "0.8b"
 #define INTERNALKEYRING_DESCRIPTION N_("This plugin provides the default password storage behaviour for libpurple. Password will be stored unencrypted.")
-#define	INTERNALKEYRING_AUTHOR      "Scrouaf (scrouaf[at]soc.pidgin.im)"
+#define INTERNALKEYRING_AUTHOR      "Scrouaf (scrouaf[at]soc.pidgin.im)"
 #define INTERNALKEYRING_ID          PURPLE_DEFAULT_KEYRING
 
 #define ACTIVATE() \
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp	591ec90b58dcfe4f1513435d11703916ae719fde
+++ libpurple/plugins/keyrings/kwallet.cpp	39b1441bcc4fc5c779731e020b9f2fe8cb409e55
@@ -43,7 +43,7 @@
 #define KWALLET_VERSION     "0.3b"
 #define KWALLET_DESCRIPTION N_("This plugin will store passwords in KWallet.")
 #define KWALLET_AUTHOR      "Scrouaf (scrouaf[at]soc.pidgin.im)"
-#define KWALLET_ID          "core-scrouaf-kwallet"
+#define KWALLET_ID          "keyring-kwallet"
 
 PurpleKeyring *keyring_handler;