pidgin/pidgin

Merge heads of release-2.x.y branch. No overlapping files.
release-2.x.y
2014-11-04, Mark Doliner
5fdaf1c7c04f
Parents b92cde3dabc6277c5fda03fe
Children c84a673e6105f3d4e059a391
Merge heads of release-2.x.y branch. No overlapping files.
1 files changed, 10 insertions(+), 1 deletions(-)
  • +10 -1
    libpurple/pluginpref.c
    • --- a/libpurple/pluginpref.c Tue Nov 04 22:15:29 2014 -0800
    +++ b/libpurple/pluginpref.c Tue Nov 04 22:16:05 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_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);
    }