# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1193640353 0
# Node ID 8b81eeaf9bcbc5da81866776f9308619b0318587
# Parent  9f0e2db39bc56d116aa0331bcad4453867daab7e# Parent  fe1b44022884c45fb9a96338760978e254508e5f
merge of '5e40b4c4c0c2949025f174c4aef2da0c54d79c31'
     and '886ce0e2c644e00427871777bb58888fbb8035cd'

diff -r 9f0e2db39bc5 -r 8b81eeaf9bcb pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon Oct 29 04:41:19 2007 +0000
+++ b/pidgin/gtkprefs.c	Mon Oct 29 06:45:53 2007 +0000
@@ -1607,18 +1607,22 @@
 test_sound(GtkWidget *button, gpointer i_am_NULL)
 {
 	char *pref;
-	gboolean temp_value;
+	gboolean temp_enabled;
+	gboolean temp_mute;
 
 	pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/enabled/%s",
 			pidgin_sound_get_event_option(sound_row_sel));
 
-	temp_value = purple_prefs_get_bool(pref);
+	temp_enabled = purple_prefs_get_bool(pref);
+	temp_mute = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute");
 
-	if (!temp_value) purple_prefs_set_bool(pref, TRUE);
+	if (!temp_enabled) purple_prefs_set_bool(pref, TRUE);
+	if (temp_mute) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", FALSE);
 
 	purple_sound_play_event(sound_row_sel, NULL);
 
-	if (!temp_value) purple_prefs_set_bool(pref, FALSE);
+	if (!temp_enabled) purple_prefs_set_bool(pref, FALSE);
+	if (temp_mute) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", TRUE);
 
 	g_free(pref);
 }