Mercurial > pidgin
comparison src/prefs.c @ 3401:1be15204741f
[gaim-migrate @ 3420]
Sound prefs bugfix. No, there aren't any sound prefs for gtk1.2. Get over
it.
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Sun, 18 Aug 2002 00:02:01 +0000 |
parents | 412d1035d666 |
children | a84c5f21e630 |
comparison
equal
deleted
inserted
replaced
3400:388dd9fbfe4e | 3401:1be15204741f |
---|---|
194 set_sound_options(); | 194 set_sound_options(); |
195 for (r = 0; r < NUM_SOUNDS; r++) { | 195 for (r = 0; r < NUM_SOUNDS; r++) { |
196 if (sound_file[r]) | 196 if (sound_file[r]) |
197 g_free(sound_file[r]); | 197 g_free(sound_file[r]); |
198 sound_file[r] = sound_file_new[r]; | 198 sound_file[r] = sound_file_new[r]; |
199 sound_file_new[r] = NULL; | |
200 } | 199 } |
201 if (away_options != away_options_new) | 200 if (away_options != away_options_new) |
202 set_away_options(); | 201 set_away_options(); |
203 away_resend = away_resend_new; | 202 away_resend = away_resend_new; |
204 auto_away = auto_away_new; | 203 auto_away = auto_away_new; |
1117 #endif | 1116 #endif |
1118 | 1117 |
1119 static void test_sound(GtkWidget *button, gpointer i_am_NULL) | 1118 static void test_sound(GtkWidget *button, gpointer i_am_NULL) |
1120 { | 1119 { |
1121 guint32 tmp_sound = sound_options; | 1120 guint32 tmp_sound = sound_options; |
1121 char *save_me=NULL; | |
1122 if (!(sound_options & OPT_SOUND_WHEN_AWAY)) | 1122 if (!(sound_options & OPT_SOUND_WHEN_AWAY)) |
1123 sound_options ^= OPT_SOUND_WHEN_AWAY; | 1123 sound_options ^= OPT_SOUND_WHEN_AWAY; |
1124 if (!(sound_options & sounds[sound_row_sel].opt)) | 1124 if (!(sound_options & sounds[sound_row_sel].opt)) |
1125 sound_options ^= sounds[sound_row_sel].opt; | 1125 sound_options ^= sounds[sound_row_sel].opt; |
1126 save_me = sound_file[sound_row_sel]; | |
1127 sound_file[sound_row_sel] = sound_file_new[sound_row_sel]; | |
1126 play_sound(sound_row_sel); | 1128 play_sound(sound_row_sel); |
1129 | |
1130 sound_file[sound_row_sel] = save_me; | |
1127 sound_options = tmp_sound; | 1131 sound_options = tmp_sound; |
1128 } | 1132 } |
1129 | 1133 |
1130 static void reset_sound(GtkWidget *button, gpointer i_am_also_NULL) | 1134 static void reset_sound(GtkWidget *button, gpointer i_am_also_NULL) |
1131 { | 1135 { |