# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1081706773 0
# Node ID f8292be3b45c887dd5bc0466475efbc54a4f19ca
# Parent  127cd17ee215a3df5e9ab27275609a51b6f89ec2
[gaim-migrate @ 9385]
<nosnilmot> KingAnt: It needs a bit more than that... leaving the pref
called silent_focus is confusing, and there's logic inversion required
in gtkconv.c

committer: Tailor Script <tailor@pidgin.im>

diff -r 127cd17ee215 -r f8292be3b45c src/gtkconv.c
--- a/src/gtkconv.c	Sun Apr 11 17:56:13 2004 +0000
+++ b/src/gtkconv.c	Sun Apr 11 18:06:13 2004 +0000
@@ -4392,7 +4392,7 @@
 
 	/* Play a sound, if specified in prefs. */
 	if (gtkconv->make_sound && !((gaim_conv_window_get_active_conversation(gaimwin) == conv) &&
-		gaim_prefs_get_bool("/gaim/gtk/sound/silent_focus") && has_focus)) {
+		!gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus)) {
 		if (flags & GAIM_MESSAGE_RECV) {
 			if (gtkconv->u.im->a_virgin &&
 				gaim_prefs_get_bool("/gaim/gtk/sound/enabled/first_im_recv")) {
@@ -4429,7 +4429,7 @@
 
 	/* Play a sound, if specified in prefs. */
 	if (gtkconv->make_sound && !((gaim_conv_window_get_active_conversation(gaimwin) == conv) &&
-		gaim_prefs_get_bool("/gaim/gtk/sound/silent_focus") && has_focus)) {
+		!gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus)) {
 		if (!(flags & GAIM_MESSAGE_WHISPER) && (flags & GAIM_MESSAGE_SEND))
 			gaim_sound_play_event(GAIM_SOUND_CHAT_YOU_SAY);
 		else if (flags & GAIM_MESSAGE_RECV) {
diff -r 127cd17ee215 -r f8292be3b45c src/gtkprefs.c
--- a/src/gtkprefs.c	Sun Apr 11 17:56:13 2004 +0000
+++ b/src/gtkprefs.c	Sun Apr 11 18:06:13 2004 +0000
@@ -1536,8 +1536,8 @@
 	vbox = gaim_gtk_make_frame (ret, _("Sound Options"));
 	gaim_gtk_prefs_checkbox(_("_No sounds when you log in"),
 				   "/gaim/gtk/sound/silent_signon", vbox);
-	gaim_gtk_prefs_checkbox(_("Play sounds when conversation has _focus"),
-				   "/gaim/gtk/sound/silent_focus", vbox);
+	gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"),
+				   "/gaim/gtk/sound/conv_focus", vbox);
 	gaim_gtk_prefs_checkbox(_("_Sounds while away"),
 				   "/core/sound/while_away", vbox);
 
diff -r 127cd17ee215 -r f8292be3b45c src/gtksound.c
--- a/src/gtksound.c	Sun Apr 11 17:56:13 2004 +0000
+++ b/src/gtksound.c	Sun Apr 11 18:06:13 2004 +0000
@@ -108,7 +108,7 @@
 	gaim_prefs_add_bool("/gaim/gtk/sound/enabled/pounce_default", TRUE);
 	gaim_prefs_add_string("/gaim/gtk/sound/file/pounce_default", "");
 	gaim_prefs_add_bool("/gaim/gtk/sound/silent_signon", TRUE);
-	gaim_prefs_add_bool("/gaim/gtk/sound/silent_focus", TRUE);
+	gaim_prefs_add_bool("/gaim/gtk/sound/conv_focus", TRUE);
 	gaim_prefs_add_string("/gaim/gtk/sound/command", "");
 	gaim_prefs_add_string("/gaim/gtk/sound/method", "automatic");