Merged revisions 966693 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r966693 | winterz | 2009-05-11 20:33:39 +0200 (Mon, 11 May 2009) | 17 lines
  
  Merged revisions 966689 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r966689 | winterz | 2009-05-11 14:26:04 -0400 (Mon, 11 May 2009) | 10 lines
    
    Invitation decline comments are now sent as DESCRIPTION property only
    when the user has selected the "exchange compatible naming" groupware option.
    Otherwise, we adhere to standards and use the COMMENT property.
    
    This should fix kolab/issue3424 more to my satisfaction.
    Also makes r965355 acceptable and that should also be merged forward,
    but before this revision.
    
    MERGE: e4,trunk,4.2
  ........
................

svn path=/trunk/KDE/kdepim/; revision=967434

callback.cpp

@@ -237,6 +237,11 @@ void Callback::deleteInvitation() const
   ( new KMDeleteMsgCommand( sernum ) )->start();
 }
 
+bool Callback::exchangeCompatibleInvitations() const
+{
+  return GlobalSettings::self()->exchangeCompatibleInvitations();
+}
+
 QString Callback::sender() const
 {
   return mMsg->from();

callback.h

@@ -80,6 +80,7 @@ class KMAIL_EXPORT Callback {
     bool askForComment( KCal::Attendee::PartStat status ) const;
     bool deleteInvitationAfterReply() const;
     void deleteInvitation() const;
+    bool exchangeCompatibleInvitations() const;
 
     /**
       Closes the main window showing this message, if it's a secondary window.