Mercurial > pidgin.yaz
changeset 8947:fa6c2d893c51
[gaim-migrate @ 9719]
Eradicate the "Sounds when you log in" preference, default to no sounds
when you log in
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 16 May 2004 06:12:03 +0000 |
| parents | 80944edf8d80 |
| children | 175cbf710a47 |
| files | src/gaimrc.c src/gtkprefs.c src/gtksound.c src/main.c |
| diffstat | 4 files changed, 4 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gaimrc.c Sun May 16 06:03:56 2004 +0000 +++ b/src/gaimrc.c Sun May 16 06:12:03 2004 +0000 @@ -1088,8 +1088,6 @@ sound_options & OPT_SOUND_FIRST_RCV); gaim_prefs_set_bool("/core/sound/when_away", sound_options & OPT_SOUND_WHEN_AWAY); - gaim_prefs_set_bool("/gaim/gtk/sound/signon", - !(sound_options & OPT_SOUND_SILENT_SIGNON)); gaim_prefs_set_bool("/gaim/gtk/sound/enabled/join_chat", sound_options & OPT_SOUND_CHAT_JOIN); gaim_prefs_set_bool("/gaim/gtk/sound/enabled/chat_msg_recv",
--- a/src/gtkprefs.c Sun May 16 06:03:56 2004 +0000 +++ b/src/gtkprefs.c Sun May 16 06:12:03 2004 +0000 @@ -1495,10 +1495,6 @@ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox = gaim_gtk_make_frame (ret, _("Sound Options")); -#if 0 /* PREFSLASH04 */ - gaim_gtk_prefs_checkbox(_("Sounds when you _log in"), - "/gaim/gtk/sound/signon", vbox); -#endif /* PREFSLASH04 */ gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"), "/gaim/gtk/sound/conv_focus", vbox); gaim_gtk_prefs_checkbox(_("_Sounds while away"), @@ -2919,8 +2915,6 @@ gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats"); gaim_prefs_rename("/core/conversations/placement", "/gaim/gtk/conversations/placement"); - gaim_prefs_rename_boolean_toggle("/gaim/gtk/sound/silent_signon", - "/gaim/gtk/sound/signon"); /* Remove some no-longer-used prefs */ gaim_prefs_remove("/gaim/gtk/blist/show_group_count"); @@ -2932,4 +2926,6 @@ gaim_prefs_remove("/gaim/gtk/conversations/show_smileys"); gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion"); gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete"); + gaim_prefs_remove("/gaim/gtk/sound/signon"); + gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); }
--- a/src/gtksound.c Sun May 16 06:03:56 2004 +0000 +++ b/src/gtksound.c Sun May 16 06:12:03 2004 +0000 @@ -107,7 +107,6 @@ gaim_prefs_add_string("/gaim/gtk/sound/file/nick_said", ""); 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/signon", FALSE); 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");
--- a/src/main.c Sun May 16 06:03:56 2004 +0000 +++ b/src/main.c Sun May 16 06:12:03 2004 +0000 @@ -122,11 +122,9 @@ * oscar.c, after the buddy list is made and serv_finish_login is called */ void gaim_setup(GaimConnection *gc) { - if (gaim_prefs_get_bool("/gaim/gtk/sound/enabled/login") - && !gaim_prefs_get_bool("/gaim/gtk/sound/signon")) { - if(snd_tmout) { + if (gaim_prefs_get_bool("/gaim/gtk/sound/enabled/login")) { + if (snd_tmout) g_source_remove(snd_tmout); - } gaim_gtk_sound_set_login_mute(TRUE); snd_tmout = gaim_timeout_add(10000, sound_timeout, NULL); }