# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1189093377 0
# Node ID 0914ce0f3e0ecd2ebe6b2e125cb07f3668e67741
# Parent  168c5eeadfc3e45a4a2231d5f160309f233caf22
Don't assume that the Gstreamer stuff isn't used on win32.  There really isn't anything to see here.

diff -r 168c5eeadfc3 -r 0914ce0f3e0e pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Thu Sep 06 15:40:57 2007 +0000
+++ b/pidgin/gtkprefs.c	Thu Sep 06 15:42:57 2007 +0000
@@ -1510,6 +1510,7 @@
 
 	gtk_widget_set_sensitive(vbox, strcmp(method, "none"));
 }
+#endif /* !_WIN32 */
 
 #ifdef USE_GSTREAMER
 static void
@@ -1524,7 +1525,6 @@
 			!strcmp(method, "esd"));
 }
 #endif /* USE_GSTREAMER */
-#endif /* !_WIN32 */
 
 
 static void
@@ -1693,9 +1693,11 @@
 	int j;
 	const char *file;
 	char *pref;
+#if !defined _WIN32 || defined USE_GSTREAMER
+	GtkWidget *label;
+#endif
 #ifndef _WIN32
 	GtkWidget *dd;
-	GtkWidget *label;
 	GtkWidget *entry;
 	const char *cmd;
 #endif
diff -r 168c5eeadfc3 -r 0914ce0f3e0e pidgin/gtksound.c
--- a/pidgin/gtksound.c	Thu Sep 06 15:40:57 2007 +0000
+++ b/pidgin/gtksound.c	Thu Sep 06 15:42:57 2007 +0000
@@ -446,6 +446,8 @@
 		g_free(command);
 		return;
 	}
+#endif /* _WIN32 */
+
 #ifdef USE_GSTREAMER
 	if (gst_init_failed)  /* Perhaps do gdk_beep instead? */
 		return;
@@ -460,7 +462,9 @@
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;
 		}
-	} else if (!strcmp(method, "esd")) {
+	}
+#ifndef _WIN32
+	else if (!strcmp(method, "esd")) {
 		sink = gst_element_factory_make("esdsink", "sink");
 		if (!sink) {
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
@@ -472,7 +476,9 @@
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;
 		}
-	} else {
+	}
+#endif
+	else {
 		purple_debug_error("sound", "Unknown sound method '%s'\n", method);
 		return;
 	}
@@ -498,9 +504,9 @@
 	g_free(uri);
 
 #else /* USE_GSTREAMER */
+
+#ifndef _WIN32
 	gdk_beep();
-	return;
-#endif /* USE_GSTREAMER */
 #else /* _WIN32 */
 	purple_debug_info("sound", "Playing %s\n", filename);
 
@@ -518,6 +524,8 @@
 		g_free(l_filename);
 	}
 #endif /* _WIN32 */
+
+#endif /* USE_GSTREAMER */
 }
 
 static void