rpms/kdepim/devel kdepim-3.5.4-kde#133846.patch, NONE, 1.1 kdepim.spec, 1.101, 1.102

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26304

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.4-kde#133846.patch 
Log Message:
fix #133846, fix for the tooltip crash



kdepim-3.5.4-kde#133846.patch:
 incidenceformatter.cpp |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE kdepim-3.5.4-kde#133846.patch ---
Index: libkcal/incidenceformatter.cpp
===================================================================
--- libkcal/incidenceformatter.cpp	(Revision 583296)
+++ libkcal/incidenceformatter.cpp	(Revision 583297)
@@ -1690,6 +1690,9 @@
 
 QString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* incidence, QString dtRangeText )
 {
+  if ( !incidence )
+    return QString::null;
+
   QString tmp = "<qt><b>"+ incidence->summary().replace("\n", "<br>")+"</b>";
 
   tmp += dtRangeText;


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdepim.spec	4 Sep 2006 17:04:55 -0000	1.101
+++ kdepim.spec	12 Sep 2006 15:43:51 -0000	1.102
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -36,6 +36,7 @@
 Patch101: kdepim-3.5.4-kde#117882.patch
 Patch102: kdepim-3.5.4-kde#131067.patch
 Patch103: kdepim-3.5.4-kde#116607.patch
+Patch104: kdepim-3.5.4-kde#133846.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -94,6 +95,7 @@
 %patch101 -p0 -b .kde#117882
 %patch102 -p0 -b .kde#131067
 %patch103 -p0 -b .kde#116607
+%patch104 -p0 -b .kde#133846
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -191,6 +193,10 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Sep 12 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
+- apply upstream patches
+   fix #133846, fix for the tooltip crash
+
 * Mon Sep 04 2006 Than Ngo <than at redhat.com> 6:3.5.4-3
 - apply upstream patches
    fix kde#116607, crash in slotCheckQueuedFolders() on application exit