--- libpurple/plugin.c.dist	2009-08-25 22:19:40.062932080 +0100
+++ libpurple/plugin.c	2009-08-25 22:20:52.011421760 +0100
@@ -876,7 +876,7 @@ purple_plugin_destroy(PurplePlugin *plug
 		 * it keeps all the plugins open, meaning that valgrind is able to
 		 * resolve symbol names in leak traces from plugins.
 		 */
-		if (!g_getenv("PURPLE_LEAKCHECK_HELP") && !RUNNING_ON_VALGRIND)
+		if (!g_getenv("PURPLE_LEAKCHECK_HELP"))
 		{
 			if (plugin->handle != NULL)
 				g_module_close(plugin->handle);
--- pidgin/plugins/themeedit.c.dist	2009-08-25 23:22:10.945222840 +0100
+++ pidgin/plugins/themeedit.c	2009-08-25 23:23:17.882320520 +0100
@@ -246,7 +246,7 @@
 				      NULL
 			      }
 		},
-		{ NULL, { } }
+		{ NULL, { NULL } }
 	};
 
 	dialog = pidgin_create_dialog(_("Pidgin Buddylist Theme Editor"), 0, "theme-editor-blist", FALSE);