branches/KDE/4.3/kdepimlibs/kcal (merge)

SVN commit 1005102 by tmcguire:

Backport r1004645 by tmcguire from trunk to the 4.3 branch:

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

................
  r1001119 | winterz | 2009-07-22 18:05:16 +0200 (Wed, 22 Jul 2009) | 12 lines
  
  Merged revisions 1001092 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1001092 | winterz | 2009-07-22 11:50:55 -0400 (Wed, 22 Jul 2009) | 5 lines
    
    more crash guards
    kolab/issue3769
    
    MERGE: e4,trunk,4.3
  ........
................



 M  +14 -10    incidenceformatter.cpp  


--- branches/KDE/4.3/kdepimlibs/kcal/incidenceformatter.cpp #1005101:1005102
@@ -1541,11 +1541,13 @@
   {
     if ( incidence && incidence->revision() > 0 && ( existingIncidence || 
!helper->calendar() ) ) {
       html += tdOpen;
-      if ( incBase->type() == "Todo" ) {
-        //TODO: 4.4, remove the []
-        html += helper->makeLink( "reply", i18n( "[Enter this into my to-do 
list]" ) );
-      } else {
-        html += helper->makeLink( "reply", i18n( "[Enter this into my 
calendar]" ) );
+      if ( incBase ) {
+        if ( incBase->type() == "Todo" ) {
+          //TODO: 4.4, remove the []
+          html += helper->makeLink( "reply", i18n( "[Enter this into my to-do 
list]" ) );
+        } else {
+          html += helper->makeLink( "reply", i18n( "[Enter this into my 
calendar]" ) );
+        }
       }
       html += tdClose;
     }
@@ -1589,7 +1591,7 @@
       html += tdClose;
 
       // Check in calendar
-      if ( incBase->type() == "Event" ) {
+      if ( incBase && incBase->type() == "Event" ) {
         html += tdOpen;
         //TODO: 4.4, remove the []
         //TODO: 4.4, change to "Check calendar"
@@ -1613,10 +1615,12 @@
     html += tdOpen;
     //TODO: 4.4, remove the []
     //TODO: 4.4, change string to "Enter this response into my..."
-    if ( incBase->type() == "Todo" ) {
-      html += helper->makeLink( "reply", i18n( "[Enter this into my to-do 
list]" ) );
-    } else {
-      html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" 
) );
+    if ( incBase ) {
+      if ( incBase->type() == "Todo" ) {
+        html += helper->makeLink( "reply", i18n( "[Enter this into my to-do 
list]" ) );
+      } else {
+        html += helper->makeLink( "reply", i18n( "[Enter this into my 
calendar]" ) );
+      }
     }
     html += tdClose;
     break;