mean smileyz may eat your email text :)
This commit is contained in:
parent
de289b4a46
commit
c1fb3f02a5
|
@ -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<Token> tokens = tokenize(text, mode | SkipHTML);
|
||||
+ if (tokens.isEmpty() && !text.isEmpty())
|
||||
+ return text;
|
||||
+
|
||||
QString result;
|
||||
|
||||
foreach(const Token &token , tokens) {
|
|
@ -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 <than@redhat.com> 4.1.1-9
|
||||
- #461725, revert the patch to fix the regression
|
||||
|
|
Loading…
Reference in New Issue