soc.2008.masterpassword: 7938c7a1: These destroy functions appear to do the...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 7938c7a109597329a03232963d305e5527725824
Parent:   c1b339415c647f1c5006ccd517ce076893ac9df9
Author:   qulogic at pidgin.im
Date:     11/19/11 23:55:50
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/7938c7a109597329a03232963d305e5527725824

Changelog: 

These destroy functions appear to do the same thing as the unload
functions, which seems like it would cause trouble.

Changes against parent c1b339415c647f1c5006ccd517ce076893ac9df9

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

-------------- next part --------------
============================================================
--- libpurple/plugins/keyrings/gnomekeyring.c	47079de8756b0810924d20eae8c4615a1e134f33
+++ libpurple/plugins/keyrings/gnomekeyring.c	c8006213b62527d02daba17402d299a6e2c5172c
@@ -352,12 +352,6 @@ gkp_unload(PurplePlugin *plugin)
 	return TRUE;
 }
 
-static void
-gkp_destroy(PurplePlugin *plugin)
-{
-	gkp_uninit();
-}
-
 PurplePluginInfo plugininfo =
 {
 	PURPLE_PLUGIN_MAGIC,		/* magic */
@@ -377,7 +371,7 @@ PurplePluginInfo plugininfo =
 	"N/A",						/* homepage */
 	gkp_load,					/* load */
 	gkp_unload,					/* unload */
-	gkp_destroy,				/* destroy */
+	NULL,						/* destroy */
 	NULL,						/* ui_info */
 	NULL,						/* extra_info */
 	NULL,						/* prefs_info */
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c	8a3cb73e2b7a517c58e9217404a0ca427b31d5fa
+++ libpurple/plugins/keyrings/internalkeyring.c	63e268e2432e6e8e06ca986e76c1de241f1fdcea
@@ -219,12 +219,6 @@ internal_keyring_unload(PurplePlugin *pl
 	return TRUE;
 }
 
-static void
-internal_keyring_destroy(PurplePlugin *plugin)
-{
-	internal_keyring_uninit();
-}
-
 PurplePluginInfo plugininfo =
 {
 	PURPLE_PLUGIN_MAGIC,				/* magic */
@@ -244,7 +238,7 @@ PurplePluginInfo plugininfo =
 	"N/A",								/* homepage */
 	internal_keyring_load,				/* load */
 	internal_keyring_unload,			/* unload */
-	internal_keyring_destroy,			/* destroy */
+	NULL,								/* destroy */
 	NULL,								/* ui_info */
 	NULL,								/* extra_info */
 	NULL,								/* prefs_info */
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp	419e47e5ee54a9022eec5051125645e38360f9f4
+++ libpurple/plugins/keyrings/kwallet.cpp	55f9dd61752f899811704544ba3dc2ffbb379eee
@@ -333,12 +333,6 @@ kwallet_unload(PurplePlugin *plugin)
 	return TRUE;
 }
 
-static void
-kwallet_destroy(PurplePlugin *plugin)
-{
-	kwallet_close(NULL);
-}
-
 PurplePluginInfo plugininfo =
 {
 	PURPLE_PLUGIN_MAGIC,				/* magic */
@@ -358,7 +352,7 @@ PurplePluginInfo plugininfo =
 	"N/A",								/* homepage */
 	kwallet_load,						/* load */
 	kwallet_unload,						/* unload */
-	kwallet_destroy,					/* destroy */
+	NULL,								/* destroy */
 	NULL,								/* ui_info */
 	NULL,								/* extra_info */
 	NULL,								/* prefs_info */