rpms/kdepim/devel kdepim-3.5.4-kde#131067.patch, NONE, 1.1 kdepim.spec, 1.99, 1.100

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.4-kde#131067.patch 
Log Message:
apply patch to fix crash when right clicking in an encapsulated email message, kde#131067



kdepim-3.5.4-kde#131067.patch:
 kmmessage.cpp       |    3 ++-
 kmreadermainwin.cpp |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE kdepim-3.5.4-kde#131067.patch ---
Index: kmail/kmreadermainwin.cpp
===================================================================
--- kmail/kmreadermainwin.cpp	(Revision 571844)
+++ kmail/kmreadermainwin.cpp	(Revision 571845)
@@ -355,7 +355,9 @@
       return;
     }
 
-    if( !aMsg.parent()->isSent() && !aMsg.parent()->isDrafts() ) {
+    if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() || aMsg.parent()->isDrafts() ) ) ) {
+      // add the reply and forward actions only if we are not in a sent-mail or drafts
+      // folder
       mReplyActionMenu->plug( menu );
       mForwardActionMenu->plug( menu );
       menu->insertSeparator();
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp	(Revision 571844)
+++ kmail/kmmessage.cpp	(Revision 571845)
@@ -86,7 +86,8 @@
 
 //-----------------------------------------------------------------------------
 KMMessage::KMMessage(DwMessage* aMsg)
-  : mMsg(aMsg),
+  : KMMsgBase(),
+    mMsg(aMsg),
     mNeedsAssembly(true),
     mDecodeHTML(false),
     mOverrideCodec(0),


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kdepim.spec	10 Aug 2006 15:20:37 -0000	1.99
+++ kdepim.spec	15 Aug 2006 15:23:38 -0000	1.100
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -34,6 +34,7 @@
 # upstream patches
 Patch100: kdepim-3.5.4-kde#132008.patch
 Patch101: kdepim-3.5.4-kde#117882.patch
+Patch102: kdepim-3.5.4-kde#131067.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -90,6 +91,7 @@
 # upstream patches
 %patch100 -p0 -b .kde#132008
 %patch101 -p0 -b .kde#117882
+%patch102 -p0 -b .kde#131067
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -187,6 +189,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Aug 15 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- apply patch to fix crash when right clicking in an encapsulated email message, kde#131067
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - apply upstream patches,
    - Kmail crashes on startup, kde#132008