im.pidgin.pidgin: 886ce0e2c644e00427871777bb58888fbb8035cd

[charkins at pidgin.im]

-----------------------------------------------------------------
Revision: 886ce0e2c644e00427871777bb58888fbb8035cd
Ancestor: c630ec53bad2efe91357c6f37e705fbb1562d4ae
Author: charkins at pidgin.im
Date: 2007-10-29T04:08:42
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Ignore mute setting when testing sounds from the preferences window.


-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	04faca1d4551677c1d13d792cb4f4656f35de298
+++ pidgin/gtkprefs.c	a9317dcb31d0d73bb1ed140f83f209c1657acc21
@@ -1607,18 +1607,22 @@ test_sound(GtkWidget *button, gpointer i
 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);
 }