From 3cf5052a81cb54b6cd82b240f33dcdaba95234e0 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Wed, 13 May 2009 13:00:27 +0000
Subject: [PATCH] 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 | 5 +++++
 callback.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/callback.cpp b/callback.cpp
index 0830f5cfd..adda35aab 100644
--- a/callback.cpp
+++ b/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();
diff --git a/callback.h b/callback.h
index 85f21fc07..5dda1ceb5 100644
--- a/callback.h
+++ b/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.