Branch 'libkolab-0.2' - mime/mimeutils.cpp

Christian Mollekopf mollekopf at kolabsys.com
Mon Jul 30 16:08:00 CEST 2012


 mime/mimeutils.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 220d3f3bc9381c7582d7ebcd5f307f0d79d622d8
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Jul 30 16:06:11 2012 +0200

    Don't crash if the organizer is not available.
    (cherry picked from commit 1853a5fce7be51056d2c4b2b3dde6a887f589cb1)

diff --git a/mime/mimeutils.cpp b/mime/mimeutils.cpp
index 355a3eb..ac26037 100644
--- a/mime/mimeutils.cpp
+++ b/mime/mimeutils.cpp
@@ -100,7 +100,9 @@ QString fromCid(const QString &cid)
 KMime::Message::Ptr createMessage(const KCalCore::Incidence::Ptr &incidencePtr, const QString &mimetype, const QString &xKolabType, const QByteArray &xml, bool v3, const QString &productId)
 {
     KMime::Message::Ptr message = createMessage( xKolabType, v3, productId );
-    message->from()->addAddress( incidencePtr->organizer()->email().toUtf8(), incidencePtr->organizer()->name() );
+    if ( incidencePtr->organizer() ) {
+        message->from()->addAddress( incidencePtr->organizer()->email().toUtf8(), incidencePtr->organizer()->name() );
+    }
     message->subject()->fromUnicodeString( incidencePtr->uid(), "utf-8" );
     
     KMime::Content *content = createMainPart( mimetype, xml );





More information about the commits mailing list