Mon, 02 Sep 2013 19:50:32 +0530
Fix keyring plugin names passed to PURPLE_PLUGIN_INIT
--- a/libpurple/plugins/keyrings/internalkeyring.c Mon Sep 02 17:39:59 2013 +0530 +++ b/libpurple/plugins/keyrings/internalkeyring.c Mon Sep 02 19:50:32 2013 +0530 @@ -1041,4 +1041,4 @@ return TRUE; } -PURPLE_PLUGIN_INIT(gnome_keyring, plugin_query, plugin_load, plugin_unload); +PURPLE_PLUGIN_INIT(internal_keyring, plugin_query, plugin_load, plugin_unload);
--- a/libpurple/plugins/keyrings/kwallet.cpp Mon Sep 02 17:39:59 2013 +0530 +++ b/libpurple/plugins/keyrings/kwallet.cpp Mon Sep 02 19:50:32 2013 +0530 @@ -504,7 +504,7 @@ "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 @@ 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" */
--- a/libpurple/plugins/keyrings/secretservice.c Mon Sep 02 17:39:59 2013 +0530 +++ b/libpurple/plugins/keyrings/secretservice.c Mon Sep 02 19:50:32 2013 +0530 @@ -325,5 +325,5 @@ return TRUE; } -PURPLE_PLUGIN_INIT(gnome_keyring, plugin_query, plugin_load, plugin_unload); +PURPLE_PLUGIN_INIT(secret_service, plugin_query, plugin_load, plugin_unload);
--- a/libpurple/plugins/keyrings/wincred.c Mon Sep 02 17:39:59 2013 +0530 +++ b/libpurple/plugins/keyrings/wincred.c Mon Sep 02 19:50:32 2013 +0530 @@ -309,4 +309,4 @@ return TRUE; } -PURPLE_PLUGIN_INIT(gnome_keyring, plugin_query, plugin_load, plugin_unload); +PURPLE_PLUGIN_INIT(wincred_keyring, plugin_query, plugin_load, plugin_unload);