merge of 'ba1c1eb7b2379ebd901c82f4533b83fa21c93f02'

Fri, 17 Aug 2007 00:35:12 +0000

author
Richard Nelson <wabz@pidgin.im>
date
Fri, 17 Aug 2007 00:35:12 +0000
changeset 19408
15b736c0db6a
parent 19407
ba1c1eb7b237 (current diff)
parent 19404
f3bfd66a7b28 (diff)
child 19409
c92e486a5d10
child 19411
450006e4bfc2

merge of 'ba1c1eb7b2379ebd901c82f4533b83fa21c93f02'
and 'f3bfd66a7b28972c90775e72a4ed7652fd8b928f'

--- 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;
 }
 

mercurial