# HG changeset patch
# User Richard Nelson <wabz@pidgin.im>
# Date 1187310912 0
# Node ID 2ec9d975a37d382ebd41979548738d69b49292aa
# Parent  758b71dcd354cbc16f0a2dc7d0471a587708a0f8# Parent  2684dac39834684e45acd6154d163b2b182a1d0a
merge of '2a491439465c5e397575898b7acc45446c9e2eeb'
     and '8c7ff33a8a8e1839194829073ff671638fd0b1be'

diff -r 758b71dcd354 -r 2ec9d975a37d finch/gntsound.c
--- a/finch/gntsound.c	Thu Aug 16 23:38:50 2007 +0000
+++ b/finch/gntsound.c	Fri Aug 17 00:35:12 2007 +0000
@@ -446,7 +446,7 @@
 
 	method = purple_prefs_get_string(make_pref("/method"));
 
-	if (!strcmp(method, "none")) {
+	if (!strcmp(method, "nosound")) {
 		return;
 	} else if (!strcmp(method, "beep")) {
 		beep();
@@ -747,6 +747,7 @@
 	}
 	if (pref_dialog->selector)
 		gnt_widget_destroy(pref_dialog->selector);
+	g_free(pref_dialog->original_profile);
 	g_free(pref_dialog);
 	pref_dialog = NULL;
 }
diff -r 758b71dcd354 -r 2ec9d975a37d finch/libgnt/gntbutton.c
--- a/finch/libgnt/gntbutton.c	Thu Aug 16 23:38:50 2007 +0000
+++ b/finch/libgnt/gntbutton.c	Fri Aug 17 00:35:12 2007 +0000
@@ -111,6 +111,7 @@
 
 	style = gnt_style_get_from_name(NULL, "small-button");
 	small_button = gnt_style_parse_bool(style);
+	g_free(style);
 	GNTDEBUG;
 }