[Gaim-commits] CVS: gaim/src prefs.c,1.234,1.235

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv16285/src

Modified Files:
	prefs.c 
Log Message:
Sound prefs bugfix.  No, there aren't any sound prefs for gtk1.2.  Get over
it.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- prefs.c	11 Aug 2002 06:42:16 -0000	1.234
+++ prefs.c	18 Aug 2002 00:02:01 -0000	1.235
@@ -196,7 +196,6 @@
 		if (sound_file[r])
 			g_free(sound_file[r]);
 		sound_file[r] = sound_file_new[r];
-		sound_file_new[r] = NULL;
 	}
 	if (away_options != away_options_new)		
 		set_away_options();
@@ -1119,11 +1118,16 @@
 static void test_sound(GtkWidget *button, gpointer i_am_NULL)
 {
 	guint32 tmp_sound = sound_options;
+	char *save_me=NULL;
 	if (!(sound_options & OPT_SOUND_WHEN_AWAY))
 		sound_options ^= OPT_SOUND_WHEN_AWAY;
 	if (!(sound_options & sounds[sound_row_sel].opt))
 		sound_options ^= sounds[sound_row_sel].opt;
+	save_me = sound_file[sound_row_sel];
+	sound_file[sound_row_sel] = sound_file_new[sound_row_sel];
 	play_sound(sound_row_sel);
+	
+	sound_file[sound_row_sel] = save_me;
 	sound_options = tmp_sound;
 }