/soc/2013/ankitkv/gobjectification: 3e21d5b61c2b: Fix keyring pl...

[Ankit Vani]

Changeset: 3e21d5b61c2b62edaefa64d9a653c13726c77132
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-02 19:50 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3e21d5b61c2b

Description:

Fix keyring plugin names passed to PURPLE_PLUGIN_INIT

diffstat:

 libpurple/plugins/keyrings/internalkeyring.c |  2 +-
 libpurple/plugins/keyrings/kwallet.cpp       |  4 ++--
 libpurple/plugins/keyrings/secretservice.c   |  2 +-
 libpurple/plugins/keyrings/wincred.c         |  2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (49 lines):

diff --git a/libpurple/plugins/keyrings/internalkeyring.c b/libpurple/plugins/keyrings/internalkeyring.c
--- a/libpurple/plugins/keyrings/internalkeyring.c
+++ b/libpurple/plugins/keyrings/internalkeyring.c
@@ -1041,4 +1041,4 @@ plugin_unload(PurplePlugin *plugin, GErr
 	return TRUE;
 }
 
-PURPLE_PLUGIN_INIT(gnome_keyring, plugin_query, plugin_load, plugin_unload);
+PURPLE_PLUGIN_INIT(internal_keyring, plugin_query, plugin_load, plugin_unload);
diff --git a/libpurple/plugins/keyrings/kwallet.cpp b/libpurple/plugins/keyrings/kwallet.cpp
--- a/libpurple/plugins/keyrings/kwallet.cpp
+++ b/libpurple/plugins/keyrings/kwallet.cpp
@@ -504,7 +504,7 @@ plugin_query(GError **error)
 		"authors",      authors,
 		"website",      PURPLE_WEBSITE,
 		"abi-version",  PURPLE_ABI_VERSION,
-		"flags",        GPLUGIN_PLUGIN_INFO_FLAGS_INTERNAL,
+		"flags",        PURPLE_PLUGIN_INFO_FLAGS_INTERNAL,
 		NULL
 	);
 }
@@ -567,7 +567,7 @@ plugin_unload(PurplePlugin *plugin, GErr
 	return TRUE;
 }
 
-PURPLE_PLUGIN_INIT(gnome_keyring, plugin_query, plugin_load, plugin_unload);
+PURPLE_PLUGIN_INIT(kwallet_keyring, plugin_query, plugin_load, plugin_unload);
 
 } /* extern "C" */
 
diff --git a/libpurple/plugins/keyrings/secretservice.c b/libpurple/plugins/keyrings/secretservice.c
--- a/libpurple/plugins/keyrings/secretservice.c
+++ b/libpurple/plugins/keyrings/secretservice.c
@@ -325,5 +325,5 @@ plugin_unload(PurplePlugin *plugin, GErr
 	return TRUE;
 }
 
-PURPLE_PLUGIN_INIT(gnome_keyring, plugin_query, plugin_load, plugin_unload);
+PURPLE_PLUGIN_INIT(secret_service, plugin_query, plugin_load, plugin_unload);
 
diff --git a/libpurple/plugins/keyrings/wincred.c b/libpurple/plugins/keyrings/wincred.c
--- a/libpurple/plugins/keyrings/wincred.c
+++ b/libpurple/plugins/keyrings/wincred.c
@@ -309,4 +309,4 @@ plugin_unload(PurplePlugin *plugin, GErr
 	return TRUE;
 }
 
-PURPLE_PLUGIN_INIT(gnome_keyring, plugin_query, plugin_load, plugin_unload);
+PURPLE_PLUGIN_INIT(wincred_keyring, plugin_query, plugin_load, plugin_unload);