diff options
author | markd <markd@pkgsrc.org> | 2007-02-03 01:52:55 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2007-02-03 01:52:55 +0000 |
commit | f3e72f48c3a24ec0011e16cc5d5eb77f8aae4e44 (patch) | |
tree | a19ea4bd0a0f231a5e223707d983702833428320 /misc/kdepim3/patches | |
parent | 8597b79c151f98e5661c587d6fda564259197920 (diff) | |
download | pkgsrc-f3e72f48c3a24ec0011e16cc5d5eb77f8aae4e44.tar.gz |
Couple of patches from KDE SVN for crashes with filtering and the new
templates feature in kmail. Bump PKGREVISION.
Diffstat (limited to 'misc/kdepim3/patches')
-rw-r--r-- | misc/kdepim3/patches/patch-ae | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae new file mode 100644 index 00000000000..f7d5c55f4bc --- /dev/null +++ b/misc/kdepim3/patches/patch-ae @@ -0,0 +1,39 @@ +$NetBSD: patch-ae,v 1.11 2007/02/03 01:52:55 markd Exp $ + +kde svn 627548 and 627641. + +--- kmail/kmfolder.cpp.orig 2007-01-16 00:28:47.000000000 +1300 ++++ kmail/kmfolder.cpp +@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrList<KMMessage + + int KMFolder::find( const KMMsgBase* msg ) const + { +- return mStorage->find( msg ); ++ return mStorage ? mStorage->find( msg ) : 0; + } + + int KMFolder::find( const KMMessage* msg ) const + { +- return mStorage->find( msg ); ++ return mStorage ? mStorage->find( msg ) : 0; + } + + int KMFolder::count( bool cache ) const +@@ -631,11 +631,13 @@ void KMFolder::setUserWhoField( const QS + mWhoField = "From"; + if ( this == kmkernel->outboxFolder() || + this == kmkernel->sentFolder() || +- this == kmkernel->draftsFolder() ) ++ this == kmkernel->draftsFolder() || ++ this == kmkernel->templatesFolder() ) + mWhoField = "To"; +- } else if ( identity.drafts() == idString() +- || identity.fcc() == idString() ) +- // drafts or sent of the identity ++ } else if ( identity.drafts() == idString() || ++ identity.templates() == idString() || ++ identity.fcc() == idString() ) ++ // drafts, templates or sent of the identity + mWhoField = "To"; + else + mWhoField = "From"; |