changeset 19296:2ec9d975a37d

merge of '2a491439465c5e397575898b7acc45446c9e2eeb' and '8c7ff33a8a8e1839194829073ff671638fd0b1be'
author Richard Nelson <wabz@pidgin.im>
date Fri, 17 Aug 2007 00:35:12 +0000
parents 758b71dcd354 (current diff) 2684dac39834 (diff)
children c8820b1c3831 b3a5e7c45b5c
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }
--- 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;
 }