soc.2008.masterpassword: 3b193768: Give this a better name.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 3b193768e0c45525eb901f7170d3f3f019e1d11f
Parent:   46052394c50008d62db7ff3fe28d2e01e480c05f
Author:   qulogic at pidgin.im
Date:     10/31/11 03:57:30
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/3b193768e0c45525eb901f7170d3f3f019e1d11f

Changelog: 

Give this a better name.

Changes against parent 46052394c50008d62db7ff3fe28d2e01e480c05f

  patched  libpurple/keyring.c
  patched  libpurple/keyring.h
  patched  libpurple/plugins/keyrings/internalkeyring.c

-------------- next part --------------
============================================================
--- libpurple/keyring.h	8ec5f2777a72add8614e4ec1eeaadf746092cec8
+++ libpurple/keyring.h	ac821b65b66f2a692172cd76a4c4aff8c88c6b8e
@@ -36,7 +36,7 @@
 /**
  * Default keyring
  */
-#define FALLBACK_KEYRING	"core-scrouaf-internalkeyring"
+#define PURPLE_DEFAULT_KEYRING "core-scrouaf-internalkeyring"
 
 /*******************************************************/
 /** @name data structures and types                    */
============================================================
--- libpurple/keyring.c	37923b6723ac53bb69531d523ea05f38d9158ded
+++ libpurple/keyring.c	cb652010e7714f6774b43d507eda0dff443c11dc
@@ -280,8 +280,8 @@ purple_keyring_init(void)
 
 	if (touse == NULL) {
 		purple_prefs_add_none("/purple/keyring");
-		purple_prefs_add_string("/purple/keyring/active", FALLBACK_KEYRING);
-		purple_keyring_to_use = g_strdup(FALLBACK_KEYRING);
+		purple_prefs_add_string("/purple/keyring/active", PURPLE_DEFAULT_KEYRING);
+		purple_keyring_to_use = g_strdup(PURPLE_DEFAULT_KEYRING);
 	} else {
 		purple_keyring_to_use = g_strdup(touse);
 	}
@@ -670,7 +670,7 @@ purple_keyring_unregister(PurpleKeyring 
 	purple_signal_emit(core, "keyring-unregister", keyring_id, keyring);
 
 	inuse = purple_keyring_get_inuse();
-	fallback = purple_keyring_find_keyring_by_id(FALLBACK_KEYRING);
+	fallback = purple_keyring_find_keyring_by_id(PURPLE_DEFAULT_KEYRING);
 
 	if (inuse == keyring) {
 		if (inuse != fallback) {
@@ -730,7 +730,7 @@ purple_keyring_import_password(PurpleAcc
 	 *  - or the configured keyring is the fallback, compatible one.
 	 */
 	if ((keyringid != NULL && g_strcmp0(realid, keyringid) != 0) ||
-	    (keyringid == NULL && g_strcmp0(FALLBACK_KEYRING, realid))) {
+	    (keyringid == NULL && g_strcmp0(PURPLE_DEFAULT_KEYRING, realid))) {
 
 		*error = g_error_new(ERR_PIDGINKEYRING , ERR_INVALID,
 			"Specified keyring id does not match the configured one.");
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c	6c61cff77f63010a9978d31a851e6ce81cd1c6a6
+++ libpurple/plugins/keyrings/internalkeyring.c	ece607a7d1bc91418b88a431300693ea21669b6f
@@ -48,7 +48,7 @@
 #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_ID          FALLBACK_KEYRING
+#define INTERNALKEYRING_ID          PURPLE_DEFAULT_KEYRING
 
 #define GET_PASSWORD(account) \
 	g_hash_table_lookup (internal_keyring_passwords, account)