diff options
| author |   Olivier Crête <tester@gentoo.org> | 2010-05-17 00:59:23 +0000 |
|---|---|---|
| committer | Olivier Crête <tester@gentoo.org> | 2010-05-17 00:59:23 +0000 |
| commit | e3e1c3eaa92db59e2beb8bd4dfbf5baf658bf59d (patch) | |
| tree | 8bdc033c9ba4ddd3499117386369515fa1f7474a /net-im/pidgin/files | |
| parent | Remove =app-laptop/batterymon-1.2.0, bug 313427. (diff) | |
| download | historical-e3e1c3eaa92db59e2beb8bd4dfbf5baf658bf59d.tar.gz historical-e3e1c3eaa92db59e2beb8bd4dfbf5baf658bf59d.tar.bz2 historical-e3e1c3eaa92db59e2beb8bd4dfbf5baf658bf59d.zip | |
Remove nls use flag ag (bug #319557) and added upstream patch for ICQ regression (bug #320061)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-im/pidgin/files')
| -rw-r--r-- | net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch b/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch new file mode 100644 index 000000000000..b6cdc6f1dc3a --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch @@ -0,0 +1,52 @@ +# +# +# patch "libpurple/protocols/oscar/oscar.c" +# from [ec79d8d9fcba376be091b363977e8f23c748eff2] +# to [c8cc188e64cc6b466711a5b56454ce70615b0eea] +# +============================================================ +--- libpurple/protocols/oscar/oscar.c ec79d8d9fcba376be091b363977e8f23c748eff2 ++++ libpurple/protocols/oscar/oscar.c c8cc188e64cc6b466711a5b56454ce70615b0eea +@@ -2486,32 +2486,6 @@ static int incomingim_chan1(OscarData *o + tmp = g_string_free(message, FALSE); + + /* +- * If the message is from an ICQ user and to an ICQ user then escape any HTML, +- * because HTML is not sent over ICQ as a means to format a message. +- * So any HTML we receive is intended to be displayed. Also, \r\n must be +- * replaced with <br> +- * +- * Note: There *may* be some clients which send messages as HTML formatted - +- * they need to be special-cased somehow. +- * +- * Update: Newer ICQ clients have started sending IMs as HTML. We can +- * distinguish HTML IMs from non-HTML IMs by looking at the features. If +- * the features are "0x 01 06" then the message is plain text. If the +- * features are "0x 01" then the message is HTML. +- */ +- if (od->icq && oscar_util_valid_name_icq(userinfo->bn) +- && (args->featureslen != 1 || args->features[0] != 0x01)) +- { +- /* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */ +- gchar *tmp2 = g_markup_escape_text(tmp, -1); +- g_free(tmp); +- tmp = tmp2; +- tmp2 = purple_strreplace(tmp, "\r\n", "<br>"); +- g_free(tmp); +- tmp = tmp2; +- } +- +- /* + * Convert iChat color tags to normal font tags. + */ + if (purple_markup_find_tag("body", tmp, &start, &end, &attribs)) +@@ -4787,7 +4761,8 @@ oscar_send_im(PurpleConnection *gc, cons + tmp2 = purple_markup_strip_html(tmp1); + is_html = FALSE; + } else { +- tmp2 = g_strdup(tmp1); ++ /* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */ ++ tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1); + is_html = TRUE; + } + g_free(tmp1); |