diff options
| author | John Bailey <rekkanoryo@rekkanoryo.org> | 2009-10-31 17:52:54 +0000 |
|---|---|---|
| committer | John Bailey <rekkanoryo@rekkanoryo.org> | 2009-10-31 17:52:54 +0000 |
| commit | 631931fe640b45c0bf623406f101cffb62a19906 (patch) | |
| tree | 89f82be2050568a05d57320430137deeeb07e82b /finch | |
| parent | 4bfaae6f20ad3a8305457b4169ec6db8192bfdda (diff) | |
| parent | cb3d8a82a3a2c1c3525be5da071e0f70197c59e6 (diff) | |
| download | pidgin-631931fe640b45c0bf623406f101cffb62a19906.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head e8995c6648becc2478de4dc29691d4c95d90d27b)
to branch 'im.pidgin.pidgin.next.minor' (head 06ed2b4fb291addacb5f426f401275e6acb050d2)
Diffstat (limited to 'finch')
| -rw-r--r-- | finch/gntsound.c | 8 | ||||
| -rw-r--r-- | finch/libgnt/configure.ac | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/finch/gntsound.c b/finch/gntsound.c index f38c835711..4256626254 100644 --- a/finch/gntsound.c +++ b/finch/gntsound.c @@ -559,18 +559,12 @@ finch_sound_play_file(const char *filename) #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 */ } diff --git a/finch/libgnt/configure.ac b/finch/libgnt/configure.ac index 0577b3d4a5..e62a8dded9 100644 --- a/finch/libgnt/configure.ac +++ b/finch/libgnt/configure.ac @@ -24,10 +24,10 @@ AC_PREREQ([2.50]) # Make sure to update ../../configure.ac with libgnt version changes. # -m4_define([gnt_lt_current], [6]) +m4_define([gnt_lt_current], [7]) m4_define([gnt_major_version], [2]) -m4_define([gnt_minor_version], [6]) -m4_define([gnt_micro_version], [2]) +m4_define([gnt_minor_version], [7]) +m4_define([gnt_micro_version], [0]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) |