Mercurial > pidgin.yaz
changeset 8633:f8292be3b45c
[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>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 11 Apr 2004 18:06:13 +0000 |
| parents | 127cd17ee215 |
| children | bcb09cc97b63 |
| files | src/gtkconv.c src/gtkprefs.c src/gtksound.c |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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);
--- 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");