Mercurial > pidgin
diff libpurple/protocols/msn/msn.c @ 31273:db330f8c1a8c
merge of '6118d1117f31a7fc8db4bd5431af400a7b46ff17'
and 'b28bde636d271fd90efcba54f25ecf7af2e5331b'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 01 Mar 2011 06:24:50 +0000 |
| parents | 8fc25b77295a ccda2eba140b |
| children | f3d11c84cc03 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Mon Feb 28 09:19:34 2011 +0000 +++ b/libpurple/protocols/msn/msn.c Tue Mar 01 06:24:50 2011 +0000 @@ -110,11 +110,9 @@ g_return_val_if_fail(str != NULL, NULL); - g_snprintf(buf, sizeof(buf), "%s%s", str, - (strchr(str, '@') ? "" : "@hotmail.com")); - - tmp = g_utf8_strdown(buf, -1); - strncpy(buf, tmp, sizeof(buf)); + tmp = g_strchomp(g_utf8_strdown(str, -1)); + g_snprintf(buf, sizeof(buf), "%s%s", tmp, + (strchr(tmp, '@') ? "" : "@hotmail.com")); g_free(tmp); return buf;