pidgin.2.x.y: d46b6cda: msn: Fix build on Windows w/ MSVC (broke..

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Jun 11 23:40:52 EDT 2012


----------------------------------------------------------------------
Revision: d46b6cda476ad5e0597933448150ce9f3bf0a7c2
Parent:   3315c5dfbd0ad16511bdcf865e5b07c02d07df24
Author:   florian at instantbird.org
Date:     06/11/12 23:37:03
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/d46b6cda476ad5e0597933448150ce9f3bf0a7c2

Changelog: 

msn: Fix build on Windows w/ MSVC (broke in 2.10.4)

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

Changes against parent 3315c5dfbd0ad16511bdcf865e5b07c02d07df24

  patched  ChangeLog
  patched  libpurple/protocols/msn/oim.c

-------------- next part --------------
============================================================
--- ChangeLog	a4ce578531f5acbe6022cc9fd2b9aa11aeba2179
+++ ChangeLog	de8e56b04f9950f55109cbd114651f33f86b2593
@@ -8,6 +8,10 @@ version 2.10.5:
 	* 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.
============================================================
--- libpurple/protocols/msn/oim.c	8ea1823a55e70a81a8b2a976fd3b5d5232d74cfb
+++ libpurple/protocols/msn/oim.c	ed5e11f6ddb996d685adbe2afbaf193511ce1c83
@@ -660,7 +660,7 @@ msn_oim_report_to_user(MsnOimRecvData *r
 		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) {


More information about the Commits mailing list