soc.2008.masterpassword: 0e1fcf74: Remove duplicate function.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 0e1fcf743be5f14ef3cbf9c78253f4da3aa6f343
Parent:   0ed8cbefec48778afa6bd6114812eb540a7e4931
Author:   qulogic at pidgin.im
Date:     11/05/11 22:25:27
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/0e1fcf743be5f14ef3cbf9c78253f4da3aa6f343

Changelog: 

Remove duplicate function.

Changes against parent 0ed8cbefec48778afa6bd6114812eb540a7e4931

  patched  libpurple/keyring.c
  patched  libpurple/keyring.h

-------------- next part --------------
============================================================
--- libpurple/keyring.h	ecc82c4144c67a0f224627e5e864dc06f5a019a6
+++ libpurple/keyring.h	118af85374128992a7aeb4cce45ee484fc574d27
@@ -215,7 +215,7 @@ extern "C" {
  *
  * @return The keyring, or NULL if not found.
  */
-PurpleKeyring *purple_keyring_get_keyring_by_id(const char *id);
+PurpleKeyring *purple_keyring_find_keyring_by_id(const char *id);
 
 /**
  * Get a list of id/name pairs (for preferences)
============================================================
--- libpurple/keyring.c	c4ad3f1dce7169882b638b5cd5cf0de79c4caea0
+++ libpurple/keyring.c	a9185cf98a6f0f5728f2f578ee6856fc476b5716
@@ -244,7 +244,7 @@ purple_keyring_pref_cb(const char *pref,
 	g_return_if_fail(type == PURPLE_PREF_STRING);
 	g_return_if_fail(id != NULL);
 
-	new = purple_keyring_get_keyring_by_id(id);
+	new = purple_keyring_find_keyring_by_id(id);
 	g_return_if_fail(new != NULL);
 
 	purple_keyring_set_inuse(new, FALSE, NULL, data);
@@ -300,7 +300,7 @@ purple_keyring_uninit(void)
 	purple_debug_info("keyring", "purple_keyring_uninit() done.\n");
 }
 
-static PurpleKeyring *
+PurpleKeyring *
 purple_keyring_find_keyring_by_id(const char *id)
 {
 	GList *l;
@@ -598,25 +598,6 @@ purple_keyring_get_options(void)
 	return list;
 }
 
-PurpleKeyring *
-purple_keyring_get_keyring_by_id(const char *id)
-{
-	const GList *keyrings;
-	PurpleKeyring *keyring;
-
-	for (keyrings = purple_keyring_get_keyrings();
-	     keyrings != NULL;
-	     keyrings = keyrings->next) {
-
-		keyring = keyrings->data;
-		if (g_strcmp0(id, keyring->id) == 0)
-			return keyring;
-
-	}
-
-	return NULL;
-}
-
 void
 purple_keyring_register(PurpleKeyring *keyring)
 {