# HG changeset patch
# User Eric Polino <aluink@pidgin.im>
# Date 1183684102 0
# Node ID 51772173a916f71a5c3967caa8d1d6f30d74e4a9
# Parent  6b85cbfc80b74f9d744761da1134a0ebdea1f5f1
Fixed a few merge errors

diff -r 6b85cbfc80b7 -r 51772173a916 finch/gntsound.c
--- 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);