pidgin/pidgin

merge of '40eb7fd73b9ad2b60740063ec38c71b4610b8891'

2007-09-18, Jeff Connelly
bef16ba1303d
Parents 40eb7fd73b9ad61c0b7325d6
Children 988898330d5f8aaa593a6269
merge of '40eb7fd73b9ad2b60740063ec38c71b4610b8891'
and 'd61c0b7325d6a4816829df53757c9176fa9b3506'
2 files changed, 9 insertions(+), 2 deletions(-)
  • +6 -0
    libpurple/protocols/myspace/markup.c
  • +3 -2
    libpurple/protocols/myspace/myspace.h
    • --- 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