Mercurial > pidgin
diff finch/gntsound.c @ 29315:7b1cfd48beab
propagate from branch 'im.pidgin.cpw.attention_ui' (head 3d97b094123bd082b1438ea44cb25169aa41315c)
to branch 'im.pidgin.pidgin.next.minor' (head d00241305ccc36eef5bd6723980b66a2e6108856)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 16 Nov 2009 22:06:27 +0000 |
| parents | d6dff41a6d4c |
| children | a87764155fa5 |
line wrap: on
line diff
--- a/finch/gntsound.c Mon Nov 16 21:57:32 2009 +0000 +++ b/finch/gntsound.c Mon Nov 16 22:06:27 2009 +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 */ }