Mercurial > pidgin.yaz
diff src/gaim.h @ 3493:4b204c262376
[gaim-migrate @ 3553]
Rob committed some bug fixes to gtk1-stable, but not to HEAD. now his computer
is acting up again, so i'm making the corresponding commits to HEAD. this
should help with yahoo i18n, segfaults on jabber, a problem in gaimrc, and
word wrapping on new mail notification.
Modified Files:
ChangeLog src/gaim.h src/gaimrc.c src/prpl.c
src/protocols/msn/msn.c src/protocols/yahoo/yahoo.c
----------------------------------------------------------------------
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Tue, 10 Sep 2002 15:31:34 +0000 |
| parents | 3da42b64304e |
| children | 6b0cb60162f4 |
line wrap: on
line diff
--- a/src/gaim.h Sun Sep 08 15:22:48 2002 +0000 +++ b/src/gaim.h Tue Sep 10 15:31:34 2002 +0000 @@ -455,11 +455,11 @@ extern const char *handle_uri(char *); #ifdef HAVE_LANGINFO_CODESET -#define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8"); -#define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET)); +#define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8") +#define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET)) #else -#define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8"); -#define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1"); +#define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8") +#define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1") #endif /*------------------------------------------------------------------------*/