rpms/kdelibs/devel kdelibs-3.5.4-kde#123941.patch, NONE, 1.1 kdelibs.spec, 1.179, 1.180

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21915

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kde#123941.patch 
Log Message:
fix #123941, qt xim plugin sometimes leads to crash



kdelibs-3.5.4-kde#123941.patch:
 kateviewinternal.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.4-kde#123941.patch ---
Index: kate/part/kateviewinternal.cpp
===================================================================
--- kate/part/kateviewinternal.cpp	(Revision 582741)
+++ kate/part/kateviewinternal.cpp	(Revision 582742)
@@ -870,7 +870,10 @@
 void KateViewInternal::updateMicroFocusHint()
 {
     int line = displayViewLine(displayCursor, true);
-    if (line == -1)
+    /* Check for hasFocus() to avoid crashes in QXIMInputContext as in bug #131266.
+    This is only a workaround until somebody can find the real reason of the crash
+    (probably it's in Qt). */
+    if (line == -1 || !hasFocus()) 
         return;
 
     KateRenderer *renderer = m_view->renderer();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- kdelibs.spec	12 Sep 2006 09:21:10 -0000	1.179
+++ kdelibs.spec	13 Sep 2006 14:38:16 -0000	1.180
@@ -58,6 +58,7 @@
 Patch107: kdelibs-3.5.4-kdebug-crash.patch
 Patch108: kdelibs-3.5.4-tango-icon.patch
 Patch109: kdelibs-3.5.4-kde#133677.patch
+Patch110: kdelibs-3.5.4-kde#123941.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -199,6 +200,7 @@
 %patch107 -p0 -b .kdebug-crash
 %patch108 -p0 -b .tango-icontheme
 %patch109 -p0 -b .kde#133677
+%patch110 -p0 -b .kde#123941
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -428,6 +430,7 @@
 %changelog
 * Tue Sep 12 2006 Than Ngo <than at redhat.com> 6:3.5.4-6
 - fix #205767, konsole no longer register itself to utmp
+- fix #123941, qt xim plugin sometimes leads to crash
 
 * Tue Sep 05 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
 - apply upstream patches