Mercurial > pidgin
changeset 19137:51772173a916
Fixed a few merge errors
| author | Eric Polino <aluink@pidgin.im> |
|---|---|
| date | Fri, 06 Jul 2007 01:08:22 +0000 |
| parents | 6b85cbfc80b7 |
| children | dd115c8f0880 |
| files | finch/gntsound.c |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntsound.c Thu Jul 05 18:21:41 2007 +0000 +++ b/finch/gntsound.c Fri Jul 06 01:08:22 2007 +0000 @@ -591,6 +591,7 @@ purple_prefs_set_bool(boolpref,gnt_tree_get_choice(GNT_TREE(pref_dialog->events),itr->data)); purple_prefs_set_path(filepref,event->file ? event->file : ""); g_free(filepref); + g_free(boolpref); } gnt_widget_destroy(GNT_WIDGET(win)); } @@ -707,9 +708,7 @@ gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"beep",_("Console Beep")); gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"custom",_("Command")); gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"nosound",_("No Sound")); - buf = g_strdup(purple_prefs_get_string(FINCH_PREFS_ROOT "/sound/method")); - gnt_combo_box_set_selected(GNT_COMBO_BOX(cmbox),buf); - g_free(buf); + gnt_combo_box_set_selected(GNT_COMBO_BOX(cmbox),(gchar *)purple_prefs_get_string(FINCH_PREFS_ROOT "/sound/method")); label = gnt_label_new_with_format(_("Sound Method"),GNT_TEXT_FLAG_BOLD); gnt_box_add_widget(GNT_BOX(win),label);