# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1415168310 28800
# Node ID c84a673e6105cf96f14f64e396c77b7e612d6afb
# Parent  c9cc21192acfa8ca6d48cc2556ed30223ea38373# Parent  5fdaf1c7c04f7a1605d00c4e219b0196bf7e3bd2
Merge release-2.x.y branch into master. No overlapping files.

diff -r c9cc21192acf -r c84a673e6105 ChangeLog
--- a/ChangeLog	Tue Nov 04 22:18:02 2014 -0800
+++ b/ChangeLog	Tue Nov 04 22:18:30 2014 -0800
@@ -82,7 +82,7 @@
 
 	General:
 	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
-          plugin (#16412)
+	  plugin (#16412)
 
 version 2.10.10 (10/22/14):
 	General:
diff -r c9cc21192acf -r c84a673e6105 libpurple/pluginpref.c
--- a/libpurple/pluginpref.c	Tue Nov 04 22:18:02 2014 -0800
+++ b/libpurple/pluginpref.c	Tue Nov 04 22:18:30 2014 -0800
@@ -142,10 +142,19 @@
 void
 purple_plugin_pref_destroy(PurplePluginPref *pref)
 {
+	GList *tmp;
 	g_return_if_fail(pref != NULL);
 
 	g_free(pref->name);
 	g_free(pref->label);
+	tmp = pref->choices;
+	while(tmp) {
+		g_free(tmp->data);
+		/* Remove the string, and the data entries */
+		tmp = g_list_delete_link(tmp, tmp);
+		tmp = g_list_delete_link(tmp, tmp);
+	}
+
 	g_list_free(pref->choices);
 	g_free(pref);
 }
@@ -253,7 +262,7 @@
 	g_return_if_fail(label != NULL);
 	g_return_if_fail(choice || purple_prefs_get_pref_type(pref->name) == PURPLE_PREF_INT);
 
-	pref->choices = g_list_append(pref->choices, (gpointer)label);
+	pref->choices = g_list_append(pref->choices, g_strdup(label));
 	pref->choices = g_list_append(pref->choices, choice);
 }