[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2007-11-12 12:40:53
Message-ID: 1194871253.533542.29093.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 735691 by vkrause:

Merged revisions 735684 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r735684 | vkrause | 2007-11-12 13:27:06 +0100 (Mon, 12 Nov 2007) | 4 lines
  
  Fix a few more cases where invitations are deleted.
  
  Kolab issue 2192
........


 _M            . (directory)  
 M  +5 -0      kmail/callback.cpp  
 M  +1 -0      kmail/callback.h  
 M  +4 -2      plugins/kmail/bodypartformatter/text_calendar.cpp  


** branches/work/kdab-post-4.0/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,71 \
1623,712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,729611,731653,733159,733883,734242,734247,734273 \
/trunk/KDE/kdepim:1-735011  + \
/branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,711623, \
712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,729611,731653,733159,733883,734242,734247,734273,735684 \
                /trunk/KDE/kdepim:1-735011
--- branches/work/kdab-post-4.0/kdepim/kmail/callback.cpp #735690:735691
@@ -217,3 +217,8 @@
         return true;
     return false;
 }
+
+bool Callback::deleteInvitationAfterReply() const
+{
+    return GlobalSettings::self()->deleteInvitationEmailsAfterSendingReplyItem();
+}
--- branches/work/kdab-post-4.0/kdepim/kmail/callback.h #735690:735691
@@ -75,6 +75,7 @@
     QString receiver() const;
   
   bool askForComment( KCal::Attendee::PartStat status ) const;
+  bool deleteInvitationAfterReply() const;
 
     /**
       Closes the main window showing this message, if it's a secondary window.
--- branches/work/kdab-post-4.0/kdepim/plugins/kmail/bodypartformatter/text_calendar.cpp \
#735690:735691 @@ -462,7 +462,8 @@
       if ( receiver.isEmpty() )
         return true;
       saveFile( receiver, iCal, "counter" );
-      ( new KMDeleteMsgCommand( callback.getMsg()->getMsgSerNum() ) )->start();
+      if ( callback.deleteInvitationAfterReply() )
+        ( new KMDeleteMsgCommand( callback.getMsg()->getMsgSerNum() ) )->start();
       return true;
     }
 
@@ -500,7 +501,8 @@
       if ( path == "reply" || path == "cancel" ) {
         // These should just be saved with their type as the dir
         if ( saveFile( "Receiver Not Searched", iCal, path ) ) {
-          ( new KMDeleteMsgCommand( c.getMsg()->getMsgSerNum() ) )->start();
+          if ( c.deleteInvitationAfterReply() )
+            ( new KMDeleteMsgCommand( c.getMsg()->getMsgSerNum() ) )->start();
           result = true;
         }
       }


[prev in list] [next in list] [prev in thread] [next in thread]