diff options
author | Gary Kramlich <grim@reaperworld.com> | 2017-06-15 03:57:34 +0000 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2017-06-15 03:57:34 +0000 |
commit | 782465b14dde41086af871c37a8f6d10d10044c1 (patch) | |
tree | 3500cd2469b45364acf2c861b58a4e185d3369da /libpurple/win32 | |
parent | 9309ac885620a96b92231e37f421bee8e181e0bb (diff) | |
parent | 02a749023065e7f4c21428589d9c98e29432b793 (diff) | |
download | pidgin-782465b14dde41086af871c37a8f6d10d10044c1.tar.gz |
Merged in dequisdequis/pidgin (pull request #208)
Merge release-2.x.y into default
Approved-by: Eion Robb <eionrobb@gmail.com>
Approved-by: Gary Kramlich <grim@reaperworld.com>
Diffstat (limited to 'libpurple/win32')
-rw-r--r-- | libpurple/win32/libc_interface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libpurple/win32/libc_interface.c b/libpurple/win32/libc_interface.c index fc4e171940..4973e7fcd3 100644 --- a/libpurple/win32/libc_interface.c +++ b/libpurple/win32/libc_interface.c @@ -929,7 +929,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) for (i = 0; win32_tzmap[i].wstd != NULL; i++) { - if (strcmp(tzname, win32_tzmap[i].wstd) == 0) + if (purple_strequal(tzname, win32_tzmap[i].wstd)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches Windows timezone \"%s\"\n", @@ -945,7 +945,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) return win32_tzmap[i].ustd; } - if (strcmp(tzname, win32_tzmap[i].wdst) == 0) + if (purple_strequal(tzname, win32_tzmap[i].wdst)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches Windows timezone \"%s\"\n", @@ -1019,7 +1019,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) RegCloseKey(key); break; } - if (strcmp(tzname, zonename) == 0) + if (purple_strequal(tzname, zonename)) { /* Matched zone */ g_strlcpy(localtzname, keyname, sizeof(localtzname)); @@ -1034,7 +1034,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) RegCloseKey(key); break; } - if (strcmp(tzname, zonename) == 0) + if (purple_strequal(tzname, zonename)) { /* Matched DST zone */ g_strlcpy(localtzname, keyname, sizeof(localtzname)); @@ -1052,7 +1052,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) /* Found a localized name, so scan for that one too */ for (i = 0; win32_tzmap[i].wstd != NULL; i++) { - if (strcmp(localtzname, win32_tzmap[i].wstd) == 0) + if (purple_strequal(localtzname, win32_tzmap[i].wstd)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n", @@ -1066,7 +1066,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm) return win32_tzmap[i].ustd; } - if (strcmp(localtzname, win32_tzmap[i].wdst) == 0) + if (purple_strequal(localtzname, win32_tzmap[i].wdst)) { #if 0 purple_debug_info("wpurple", "TZ \"%s\" matches localized Windows timezone \"%s\" (\"%s\")\n", |