diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
commit | 01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (patch) | |
tree | 6dfcf9c3c4143226d0ef65ce2d139f80f8fcacc1 /extra/pidgin | |
parent | 40e1222c1402c0d2aded73b95802f8197d0691a6 (diff) | |
parent | 9343f37ee7ba1aa98f65272412d331a280890e12 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/epdfview/PKGBUILD
community/gpa/PKGBUILD
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/lmctl/PKGBUILD
community/mediatomb/PKGBUILD
community/ruby-atk/PKGBUILD
community/ruby-gdkpixbuf2/PKGBUILD
community/ruby-gio2/PKGBUILD
community/ruby-glib2/PKGBUILD
community/ruby-pango/PKGBUILD
core/eglibc/glibc-2.10-bz4781.patch
core/eglibc/glibc-2.10-dont-build-timezone.patch
core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch
core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
core/eglibc/glibc-2.13-futex.patch
core/eglibc/glibc-__i686.patch
extra/silc-toolkit/PKGBUILD
Diffstat (limited to 'extra/pidgin')
-rw-r--r-- | extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff deleted file mode 100644 index de4b126d0..000000000 --- a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff +++ /dev/null @@ -1,21 +0,0 @@ -============================================================ ---- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78 -+++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839 -@@ -408,9 +408,16 @@ silc_private_message(SilcClient client, - } - - if (flags & SILC_MESSAGE_FLAG_UTF8) { -- tmp = g_markup_escape_text((const char *)message, -1); -+ const char *msg = (const char *)message; -+ char *salvaged = NULL; -+ if (!g_utf8_validate((const char *)message, -1, NULL)) { -+ salvaged = purple_utf8_salvage((const char *)message); -+ msg = salvaged; -+ } -+ tmp = g_markup_escape_text(msg, -1); - /* Send to Purple */ - serv_got_im(gc, sender->nickname, tmp, 0, time(NULL)); -+ g_free(salvaged); - g_free(tmp); - } - } |