From c1fb3f02a5215963c270a044d5c749591935ae9e Mon Sep 17 00:00:00 2001 From: Lukas Tinkl Date: Thu, 18 Sep 2008 12:32:58 +0000 Subject: [PATCH] mean smileyz may eat your email text :) --- kdelibs-4.1.1-kde#860005-emoticons.patch | 14 ++++++++++++++ kdelibs.spec | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 kdelibs-4.1.1-kde#860005-emoticons.patch diff --git a/kdelibs-4.1.1-kde#860005-emoticons.patch b/kdelibs-4.1.1-kde#860005-emoticons.patch new file mode 100644 index 0000000..6f685cb --- /dev/null +++ b/kdelibs-4.1.1-kde#860005-emoticons.patch @@ -0,0 +1,14 @@ +Index: kutils/kemoticons/kemoticonstheme.cpp +=================================================================== +--- kutils/kemoticons/kemoticonstheme.cpp (revision 860004) ++++ kutils/kemoticons/kemoticonstheme.cpp (revision 860005) +@@ -161,6 +161,9 @@ + QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const + { + QList tokens = tokenize(text, mode | SkipHTML); ++ if (tokens.isEmpty() && !text.isEmpty()) ++ return text; ++ + QString result; + + foreach(const Token &token , tokens) { diff --git a/kdelibs.spec b/kdelibs.spec index d7008de..30fbdba 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -90,6 +90,7 @@ Patch103: kdelibs-4.1.1-kutils-fixes.patch Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch +Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch BuildRequires: qt4-devel >= 4.4.0 Requires: qt4 >= %{_qt4_version} @@ -225,6 +226,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch104 -p0 -b .kdeui-widgets-fixes %patch105 -p0 -b .kde#858795-mimeassoc %patch106 -p0 -b .kde#860095-khtml-scroll-crash +%patch107 -p0 -b .kde#860005-emoticons %build @@ -389,6 +391,9 @@ rm -rf %{buildroot} - Fix file association bug, the global mimeapps.list file had priority over the local one. - khtml scroll crash fix (kdebug:170880) +- Don't eat text when the emoticons were not installed. This fixes + mail text not being displayed in KMail when kdebase-runtime wasn't + installed. * Tue Sep 16 2008 Than Ngo 4.1.1-9 - #461725, revert the patch to fix the regression