pidgin/pidgin

msn: Fix build on Windows w/ MSVC (broke in 2.10.4)
release-2.x.y
2012-06-12, Florian Quèze
3c484eb8725e
Parents e4d663169108
Children 02ad66f62757
msn: Fix build on Windows w/ MSVC (broke in 2.10.4)

Merged https://hg.instantbird.org/instantbird/rev/392231064149 from
InstantBird. Thanks, Florian!


committer: Paul Aurich
2 files changed, 5 insertions(+), 1 deletions(-)
  • +4 -0
    ChangeLog
  • +1 -1
    libpurple/protocols/msn/oim.c
    • --- a/ChangeLog Sat Jun 02 02:30:13 2012 +0000
    +++ b/ChangeLog Tue Jun 12 03:37:03 2012 +0000
    @@ -8,6 +8,10 @@
    * Fix a crash that may occur when trying to ignore a user who is
    not in the current chat room. (#15139)
    + MSN:
    + * Fix building with MSVC on Windows (broken in 2.10.4). (Florian
    + Quèze)
    +
    version 2.10.4 (05/06/2012):
    General:
    * Support building against Farstream in addition to Farsight.
    --- a/libpurple/protocols/msn/oim.c Sat Jun 02 02:30:13 2012 +0000
    +++ b/libpurple/protocols/msn/oim.c Tue Jun 12 03:37:03 2012 +0000
    @@ -660,7 +660,7 @@
    charset = msn_message_get_charset(message);
    }
    - if (charset && !((strncasecmp(charset, "UTF-8", 5) == 0) || (strncasecmp(charset, "UTF8", 4) == 0))) {
    + if (charset && !((g_ascii_strncasecmp(charset, "UTF-8", 5) == 0) || (g_ascii_strncasecmp(charset, "UTF8", 4) == 0))) {
    clean_msg = g_convert(decode_msg, body_len, "UTF-8", charset, NULL, NULL, NULL);
    if (!clean_msg) {