comparison 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
comparison
equal deleted inserted replaced
3492:3b9b5e06c2e0 3493:4b204c262376
453 extern FILE *gaim_mkstemp(gchar **); 453 extern FILE *gaim_mkstemp(gchar **);
454 extern char *convert_string(char *, const char *, const char *); 454 extern char *convert_string(char *, const char *, const char *);
455 extern const char *handle_uri(char *); 455 extern const char *handle_uri(char *);
456 456
457 #ifdef HAVE_LANGINFO_CODESET 457 #ifdef HAVE_LANGINFO_CODESET
458 #define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8"); 458 #define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8")
459 #define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET)); 459 #define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET))
460 #else 460 #else
461 #define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8"); 461 #define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8")
462 #define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1"); 462 #define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1")
463 #endif 463 #endif
464 464
465 /*------------------------------------------------------------------------*/ 465 /*------------------------------------------------------------------------*/
466 /* Multi-Entry dialog and vCard dialog support */ 466 /* Multi-Entry dialog and vCard dialog support */
467 /*------------------------------------------------------------------------*/ 467 /*------------------------------------------------------------------------*/