rpms/kdelibs/F-9 kdelibs-4.1.1-kde#860005-emoticons.patch, NONE, 1.1 kdelibs.spec, 1.352, 1.353

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5327

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.1-kde#860005-emoticons.patch 
Log Message:
mean smileyz may eat your email text :)


kdelibs-4.1.1-kde#860005-emoticons.patch:

--- NEW FILE kdelibs-4.1.1-kde#860005-emoticons.patch ---
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) {


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- kdelibs.spec	18 Sep 2008 12:28:21 -0000	1.352
+++ kdelibs.spec	18 Sep 2008 12:32:58 -0000	1.353
@@ -90,6 +90,7 @@
 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 @@
 %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 @@
 - 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 at redhat.com> 4.1.1-9
 - #461725, revert the patch to fix the regression