/pidgin/main: c84a673e6105: Merge release-2.x.y branch into mast...

Changeset: c84a673e6105cf96f14f64e396c77b7e612d6afb
Author:	 Mark Doliner <[email protected]>
Date:	 2014-11-04 22:18 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/c84a673e6105

Description:

Merge release-2.x.y branch into master. No overlapping files.

diffstat:

 ChangeLog              |   2 +-
 libpurple/pluginpref.c |  11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (44 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,7 +82,7 @@ version 2.10.11 (?/?/?):
 
 	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 --git a/libpurple/pluginpref.c b/libpurple/pluginpref.c
--- a/libpurple/pluginpref.c
+++ b/libpurple/pluginpref.c
@@ -142,10 +142,19 @@ purple_plugin_pref_new_with_name_and_lab
 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 @@ purple_plugin_pref_add_choice(PurplePlug
 	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);
 }