Author: ranger
Date: Fri Mar 16 17:40:32 2007
New Revision: 724
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=724&repname=user%3a+ranger>
Log:
not twice
Modified:
trunk/experimental/10.3/crypto/finkinfo/kdepim3.patch
trunk/experimental/10.4/crypto/finkinfo/kdepim3.patch
trunk/experimental/common/crypto/finkinfo/kdepim3.patch
Modified: trunk/experimental/10.3/crypto/finkinfo/kdepim3.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/crypto/finkinfo/kdepim3.patch&rev=724&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/crypto/finkinfo/kdepim3.patch (original)
+++ trunk/experimental/10.3/crypto/finkinfo/kdepim3.patch Fri Mar 16 17:40:32
2007
@@ -1394,36 +1394,3 @@
libkolabwizard.la libgroupwisewizard.la \
libexchangewizard.la
---- kdepim-3.5.6/kmail/kmfolder.cpp 2007-01-15 06:28:47.000000000 -0500
-+++ kdepim-3.5.6-new/kmail/kmfolder.cpp 2007-03-10 10:11:55.000000000
-0500
-@@ -426,12 +426,12 @@
-
- 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 @@
- 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.templates() == idString()
- || identity.fcc() == idString() )
-- // drafts or sent of the identity
-+ // drafts, templates or sent of the identity
- mWhoField = "To";
- else
- mWhoField = "From";
Modified: trunk/experimental/10.4/crypto/finkinfo/kdepim3.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/kdepim3.patch&rev=724&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/kdepim3.patch (original)
+++ trunk/experimental/10.4/crypto/finkinfo/kdepim3.patch Fri Mar 16 17:40:32
2007
@@ -1394,36 +1394,3 @@
libkolabwizard.la libgroupwisewizard.la \
libexchangewizard.la
---- kdepim-3.5.6/kmail/kmfolder.cpp 2007-01-15 06:28:47.000000000 -0500
-+++ kdepim-3.5.6-new/kmail/kmfolder.cpp 2007-03-10 10:11:55.000000000
-0500
-@@ -426,12 +426,12 @@
-
- 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 @@
- 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.templates() == idString()
- || identity.fcc() == idString() )
-- // drafts or sent of the identity
-+ // drafts, templates or sent of the identity
- mWhoField = "To";
- else
- mWhoField = "From";
Modified: trunk/experimental/common/crypto/finkinfo/kdepim3.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/kdepim3.patch&rev=724&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/kdepim3.patch (original)
+++ trunk/experimental/common/crypto/finkinfo/kdepim3.patch Fri Mar 16 17:40:32
2007
@@ -1474,37 +1474,3 @@
libkolabwizard.la libgroupwisewizard.la \
libexchangewizard.la
-diff -uNr kdepim-3.5.6/kmail/kmfolder.cpp kdepim-3.5.6-new/kmail/kmfolder.cpp
---- kdepim-3.5.6/kmail/kmfolder.cpp 2007-01-15 06:28:47.000000000 -0500
-+++ kdepim-3.5.6-new/kmail/kmfolder.cpp 2007-03-10 10:11:55.000000000
-0500
-@@ -426,12 +426,12 @@
-
- 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 @@
- 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.templates() == idString()
- || identity.fcc() == idString() )
-- // drafts or sent of the identity
-+ // drafts, templates or sent of the identity
- mWhoField = "To";
- else
- mWhoField = "From";
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
