comparison src/gaimrc.c @ 4581:4b1e24835bbf

[gaim-migrate @ 4864] put NAS sound support back in, and re-wrote a lot of the libao stuff this should mostly put an end to people having to make a ~/.libao file committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Fri, 14 Feb 2003 20:57:32 +0000
parents 9df99116840a
children eddb870a3c4d
comparison
equal deleted inserted replaced
4580:3fef2d45dce0 4581:4b1e24835bbf
756 chat_options = atoi(p->value[0]); 756 chat_options = atoi(p->value[0]);
757 } else if (!strcmp(p->option, "font_options")) { 757 } else if (!strcmp(p->option, "font_options")) {
758 font_options = atoi(p->value[0]); 758 font_options = atoi(p->value[0]);
759 } else if (!strcmp(p->option, "sound_options")) { 759 } else if (!strcmp(p->option, "sound_options")) {
760 sound_options = atoi(p->value[0]); 760 sound_options = atoi(p->value[0]);
761 gaim_sound_change_output_method();
761 } else if (!strcmp(p->option, "away_options")) { 762 } else if (!strcmp(p->option, "away_options")) {
762 away_options = atoi(p->value[0]); 763 away_options = atoi(p->value[0]);
763 away_resend = atoi(p->value[1]); 764 away_resend = atoi(p->value[1]);
764 } else if (!strcmp(p->option, "font_face")) { 765 } else if (!strcmp(p->option, "font_face")) {
765 g_snprintf(fontface, sizeof(fontface), "%s", p->value[0]); 766 g_snprintf(fontface, sizeof(fontface), "%s", p->value[0]);
797 } 798 }
798 799
799 } 800 }
800 801
801 /* this is where we do bugs and compatibility stuff */ 802 /* this is where we do bugs and compatibility stuff */
802 if (!(sound_options & (OPT_SOUND_BEEP | OPT_SOUND_NORMAL | OPT_SOUND_CMD))) 803 if (!(sound_options & (OPT_SOUND_BEEP | OPT_SOUND_NORMAL | OPT_SOUND_ESD
804 | OPT_SOUND_ARTS | OPT_SOUND_NAS | OPT_SOUND_CMD)))
803 sound_options |= OPT_SOUND_NORMAL; 805 sound_options |= OPT_SOUND_NORMAL;
804 806
805 if (conv_size.width == 0 && 807 if (conv_size.width == 0 &&
806 conv_size.height == 0 && 808 conv_size.height == 0 &&
807 conv_size.entry_height == 0) { 809 conv_size.entry_height == 0) {
820 822
821 if (read_general) { 823 if (read_general) {
822 if (!read_logging) { 824 if (!read_logging) {
823 logging_options = 0; 825 logging_options = 0;
824 if (general_options & OPT_GEN_LOG_ALL) 826 if (general_options & OPT_GEN_LOG_ALL)
825 logging_options |= OPT_LOG_CONVOS | OPT_LOG_CHATS; 827 logging_options |= OPT_LOG_CONVOS | OPT_LOG_CHATS;
826 if (general_options & OPT_GEN_STRIP_HTML) 828 if (general_options & OPT_GEN_STRIP_HTML)
827 logging_options |= OPT_LOG_STRIP_HTML; 829 logging_options |= OPT_LOG_STRIP_HTML;
828 } 830 }
829 for (i = 0; gen_replace[i].val; i++) 831 for (i = 0; gen_replace[i].val; i++)
830 if (general_options & gen_replace[i].old) 832 if (general_options & gen_replace[i].old)
1230 OPT_SOUND_LOGIN | 1232 OPT_SOUND_LOGIN |
1231 OPT_SOUND_LOGOUT | 1233 OPT_SOUND_LOGOUT |
1232 OPT_SOUND_RECV | 1234 OPT_SOUND_RECV |
1233 OPT_SOUND_SEND | 1235 OPT_SOUND_SEND |
1234 OPT_SOUND_SILENT_SIGNON | 1236 OPT_SOUND_SILENT_SIGNON |
1235 OPT_SOUND_NORMAL; 1237 OPT_SOUND_NORMAL |
1238 OPT_SOUND_NAS;
1236 1239
1237 #ifdef USE_SCREENSAVER 1240 #ifdef USE_SCREENSAVER
1238 report_idle = IDLE_SCREENSAVER; 1241 report_idle = IDLE_SCREENSAVER;
1239 #else 1242 #else
1240 report_idle = IDLE_GAIM; 1243 report_idle = IDLE_GAIM;