# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1126065611 0
# Node ID 448ebda0f7ec2947a468430fc14c543467263a26
# Parent  a147a8a056783604326f1077cd9683865eaec8c6
[gaim-migrate @ 13703]
Get rid of some nested #ifdef USE_LIBAO lines.  I think they were left
over from past changes.  Maybe from before we used libao for nas

committer: Tailor Script <tailor@pidgin.im>

diff -r a147a8a05678 -r 448ebda0f7ec src/gtksound.c
--- a/src/gtksound.c	Tue Sep 06 21:36:53 2005 +0000
+++ b/src/gtksound.c	Wed Sep 07 04:00:11 2005 +0000
@@ -76,7 +76,7 @@
 #endif /* USE_AO */
 
 static gboolean
-mute_login_sounds_cb(gpointer data)
+unmute_login_sounds_cb(gpointer data)
 {
 	mute_login_sounds = FALSE;
 	mute_login_sounds_timeout = 0;
@@ -94,7 +94,7 @@
 	if (mute_login_sounds_timeout != 0)
 		g_source_remove(mute_login_sounds_timeout);
 	mute_login_sounds = TRUE;
-	mute_login_sounds_timeout = gaim_timeout_add(10000, mute_login_sounds_cb, NULL);
+	mute_login_sounds_timeout = gaim_timeout_add(10000, unmute_login_sounds_cb, NULL);
 }
 
 static void
@@ -208,7 +208,7 @@
 	sound_initialized = FALSE;
 }
 
-#if defined(USE_AO)
+#ifdef USE_AO
 static gboolean
 expire_old_child(gpointer data)
 {
@@ -231,12 +231,10 @@
 gaim_gtk_sound_play_file(const char *filename)
 {
 	const char *method;
-#if defined(USE_AO)
+#ifdef USE_AO
 	pid_t pid;
-#ifdef USE_AO
 	AFfilehandle file;
 #endif
-#endif
 
 	if (!sound_initialized)
 		gaim_prefs_trigger_callback("/gaim/gtk/sound/method");
@@ -291,12 +289,12 @@
 		g_free(command);
 		return;
 	}
-#if defined(USE_AO)
+#ifdef USE_AO
 	pid = fork();
 	if (pid < 0)
 		return;
 	else if (pid == 0) {
-#ifdef USE_AO
+		/* Child process */
 		file = afOpenFile(filename, "rb", NULL);
 		if(file) {
 			ao_device *device;
@@ -346,9 +344,9 @@
 			afCloseFile(file);
 		}
 		ao_shutdown();
-#endif /* USE_AO */
 		_exit(0);
 	} else {
+		/* Parent process */
 		gaim_timeout_add(PLAY_SOUND_TIMEOUT, expire_old_child, GINT_TO_POINTER(pid));
 	}
 #else /* USE_AO */