diff finch/gntsound.c @ 29747:3f84b7069366

propagate from branch 'im.pidgin.pidgin' (head d4d86f679550b678b19fb6ca8b2eeac194d66a45) to branch 'im.pidgin.pidgin.next.minor' (head fa2afb799773bed4de2047c0cf73354e22865648)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sat, 06 Feb 2010 18:19:03 +0000
parents d6dff41a6d4c
children a87764155fa5
line wrap: on
line diff
--- a/finch/gntsound.c	Sat Feb 06 06:53:31 2010 +0000
+++ b/finch/gntsound.c	Sat Feb 06 18:19:03 2010 +0000
@@ -559,18 +559,12 @@
 #else /* _WIN32 */
 	purple_debug_info("sound", "Playing %s\n", filename);
 
-	if (G_WIN32_HAVE_WIDECHAR_API ()) {
+	{
 		wchar_t *wc_filename = g_utf8_to_utf16(filename,
 				-1, NULL, NULL, NULL);
 		if (!PlaySoundW(wc_filename, NULL, SND_ASYNC | SND_FILENAME))
 			purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n");
 		g_free(wc_filename);
-	} else {
-		char *l_filename = g_locale_from_utf8(filename,
-				-1, NULL, NULL, NULL);
-		if (!PlaySoundA(l_filename, NULL, SND_ASYNC | SND_FILENAME))
-			purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n");
-		g_free(l_filename);
 	}
 #endif /* _WIN32 */
 }