Index: src/gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.348 diff -u -p -u -r1.348 gtkconv.c --- src/gtkconv.c 11 Apr 2004 16:09:06 -0000 1.348 +++ src/gtkconv.c 11 Apr 2004 18:01:27 -0000 @@ -4392,7 +4392,7 @@ gaim_gtkconv_write_im(GaimConversation * /* 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 @@ gaim_gtkconv_write_chat(GaimConversation /* 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) { Index: src/gtksound.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtksound.c,v retrieving revision 1.14 diff -u -p -u -r1.14 gtksound.c --- src/gtksound.c 11 Apr 2004 17:56:13 -0000 1.14 +++ src/gtksound.c 11 Apr 2004 18:01:27 -0000 @@ -108,7 +108,7 @@ static void gaim_gtk_sound_init(void) 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"); Index: src/gtkprefs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v retrieving revision 1.135 diff -u -p -u -r1.135 gtkprefs.c --- src/gtkprefs.c 11 Apr 2004 17:56:13 -0000 1.135 +++ src/gtkprefs.c 11 Apr 2004 18:01:28 -0000 @@ -1536,8 +1536,8 @@ GtkWidget *sound_page() { 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);