Mercurial > pidgin
changeset 20148:e86f136e880e
merge of 'abe5c21ff8b83812c256bc2b14a3f887ecc628b8'
and 'bf8de57ed4c36f188044ea0684c201d0a1a67169'
| author | Jeffrey Connelly <jaconnel@calpoly.edu> |
|---|---|
| date | Tue, 18 Sep 2007 01:08:46 +0000 |
| parents | 51457cf3d27b (current diff) 4bb2ab77938e (diff) |
| children | be2538a92099 48374dc14adc |
| files | libpurple/protocols/jabber/.todo libpurple/protocols/myspace/markup.c libpurple/protocols/myspace/myspace.h libpurple/protocols/oscar/.todo |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/markup.c Tue Sep 18 01:02:55 2007 +0000 +++ b/libpurple/protocols/myspace/markup.c Tue Sep 18 01:08:46 2007 +0000 @@ -504,6 +504,7 @@ /* TODO: color (bg uses <body>), emoticons */ } else { + gchar *err; #ifdef MSIM_MARKUP_SHOW_UNKNOWN_TAGS *begin = g_strdup_printf("[%s]", root->name); @@ -512,6 +513,11 @@ *begin = g_strdup(""); *end = g_strdup(""); #endif + + err = g_strdup_printf("html_tag_to_msim_markup: unrecognized " + "HTML tag %s was sent by the IM client; ignoring"); + msim_unrecognized(NULL, NULL, err); + g_free(err); } }
--- a/libpurple/protocols/myspace/myspace.h Tue Sep 18 01:02:55 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.h Tue Sep 18 01:08:46 2007 +0000 @@ -67,8 +67,9 @@ /*#define MSIM_DEBUG_LOGIN_CHALLENGE*/ /*#define MSIM_DEBUG_RXBUF */ -/* Encode unknown HTML tags in messages in [], instead of ignoring */ -#define MSIM_MARKUP_SHOW_UNKNOWN_TAGS +/* Encode unknown HTML tags from IM clients in messages as [tag], instead of + * ignoring. Useful for debugging */ +/*#define MSIM_MARKUP_SHOW_UNKNOWN_TAGS */ /* Define to cause init_plugin() to run some tests and print * the results to the Purple debug log, then exit. Useful to