2 commits - icalendar/imip.cpp kolabformat/formathelpers.cpp kolabformat/kolabdefinitions.h

[Christian Mollekopf]

 icalendar/imip.cpp             |    4 ++--
 kolabformat/formathelpers.cpp  |   10 ++++++++++
 kolabformat/kolabdefinitions.h |    6 ++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 4e9cb44a53d3d26a3d8c29ddb505c2aa7a472f22
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Oct 26 02:43:08 2012 +0200

    Use the correct default return types.
    
    Thanks to David Faure for the patch.

diff --git a/icalendar/imip.cpp b/icalendar/imip.cpp
index 0098bdb..11e8962 100644
--- a/icalendar/imip.cpp
+++ b/icalendar/imip.cpp
@@ -144,7 +144,7 @@ QByteArray mailAttendees( const KCalCore::IncidenceBase::Ptr &incidence,
   KCalCore::Attendee::List attendees = incidence->attendees();
   if ( attendees.isEmpty() ) {
     kWarning() << "There are no attendees to e-mail";
-    return false;
+    return QByteArray();
   }
 
   const QString from = incidence->organizer()->fullName();
@@ -187,7 +187,7 @@ QByteArray mailAttendees( const KCalCore::IncidenceBase::Ptr &incidence,
   if( toList.isEmpty() && ccList.isEmpty() ) {
     // Not really to be called a groupware meeting, eh
     kWarning() << "There are really no attendees to e-mail";
-    return false;
+    return QByteArray();
   }
   QString to;
   if ( !toList.isEmpty() ) {


commit 58e3705c68a0609775d8e890271f80121efb0d17
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Oct 26 02:42:26 2012 +0200

    Added some more definitions for folder-type annotations

diff --git a/kolabformat/formathelpers.cpp b/kolabformat/formathelpers.cpp
index 1badcf6..4984365 100644
--- a/kolabformat/formathelpers.cpp
+++ b/kolabformat/formathelpers.cpp
@@ -55,6 +55,16 @@ FolderType folderTypeFromString(const std::string& folderTypeName)
         folderTypeName == KOLAB_FOLDER_TYPE_NOTE KOLAB_FOLDER_TYPE_DEFAULT_SUFFIX ) {
         return NoteType;
     }
+    
+    if ( folderTypeName == KOLAB_FOLDER_TYPE_CONFIGURATION ||
+        folderTypeName == KOLAB_FOLDER_TYPE_CONFIGURATION KOLAB_FOLDER_TYPE_DEFAULT_SUFFIX ) {
+        return ConfigurationType;
+    }
+    
+    if ( folderTypeName == KOLAB_FOLDER_TYPE_FREEBUSY ||
+        folderTypeName == KOLAB_FOLDER_TYPE_FREEBUSY KOLAB_FOLDER_TYPE_DEFAULT_SUFFIX ) {
+        return FreebusyType;
+    }
 
     return MailType;
 }
diff --git a/kolabformat/kolabdefinitions.h b/kolabformat/kolabdefinitions.h
index bf861f5..9a14306 100644
--- a/kolabformat/kolabdefinitions.h
+++ b/kolabformat/kolabdefinitions.h
@@ -30,6 +30,12 @@ namespace Kolab {
 #define KOLAB_FOLDER_TYPE_FREEBUSY      "freebusy"
 
 #define KOLAB_FOLDER_TYPE_DEFAULT_SUFFIX ".default"
+#define KOLAB_FOLDER_TYPE_DRAFT_SUFFIX ".drafts"
+#define KOLAB_FOLDER_TYPE_SENT_SUFFIX ".sentitems"
+#define KOLAB_FOLDER_TYPE_OUTBOX_SUFFIX ".outbox"
+#define KOLAB_FOLDER_TYPE_TRASH_SUFFIX ".wastebasket"
+#define KOLAB_FOLDER_TYPE_JUNK_SUFFIX ".junkemail"
+#define KOLAB_FOLDER_TYPE_INBOX_SUFFIX ".inbox"
 
 #define KOLAB_FOLDER_TYPE_ANNOTATION "/vendor/kolab/folder-type"