branches/KDE/4.3/kdepim (merge)

SVN commit 1005090 by tmcguire:

Backport r1004666 by tmcguire from trunk to the 4.3 branch:

SVN_MERGE
Merged revisions 1001006 via svnmerge from 
svn+ssh://tmcguire@xxxxxxxxxxx/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001006 | winterz | 2009-07-22 15:02:04 +0200 (Wed, 22 Jul 2009) | 13 lines
  
  Merged revisions 1000899 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1000899 | vkrause | 2009-07-22 05:44:38 -0400 (Wed, 22 Jul 2009) | 6 lines
    
    Also recognize invitation attachments marked as text/x-vcalendar instead
    of text/calendar.
    
    Kolab issue 3744
    MERGE: e4, trunk, 4.3
  ........
................



 M  +3 -0      mimelib/dw_mime.cpp  
 M  +7 -4      plugins/kmail/bodypartformatter/text_calendar.cpp  


--- branches/KDE/4.3/kdepim/mimelib/dw_mime.cpp #1005089:1005090
@@ -344,6 +344,9 @@
         if (DwStrcasecmp(aStr, "x-diff") == 0) {
             type = DwMime::kSubtypeXDiff;
         }
+        if (DwStrcasecmp(aStr, "x-vcalendar") == 0) {
+            type = DwMime::kSubtypeVCal;
+        }
         break;
     }
     return type;
--- branches/KDE/4.3/kdepim/plugins/kmail/bodypartformatter/text_calendar.cpp 
#1005089:1005090
@@ -324,10 +324,12 @@
         if ( iface.isValid() ) {
           iface.call( "newInstance" );
           QDBusReply<bool> r = iface.call( "load" );
-          if ( !r.isValid() || !r.value() )
+          if ( !r.isValid() || !r.value() ) {
             kWarning() << "Loading korganizer failed: " << 
iface.lastError().message();
-        } else
+          }
+        } else {
           kWarning() << "Couldn't obtain korganizer D-Bus interface" << 
iface.lastError().message();
+        }
 
         // We don't do anything with it, we just need it to be running so that 
it handles
         // the incoming directory.
@@ -675,19 +677,20 @@
   public:
     const KMail::Interface::BodyPartFormatter *bodyPartFormatter( int idx ) 
const
     {
-      if ( idx == 0 ) return new Formatter();
+      if ( idx == 0 || idx == 1 ) return new Formatter();
       else return 0;
     }
 
     const char *type( int idx ) const
     {
-      if ( idx == 0 ) return "text";
+      if ( idx == 0 || idx == 1 ) return "text";
       else return 0;
     }
 
     const char *subtype( int idx ) const
     {
       if ( idx == 0 ) return "calendar";
+      if ( idx == 1 ) return "x-vcalendar";
       else return 0;
     }