[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-08-26 16:14:47
Message-ID: 1251303287.127220.30397.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1015927 by tmcguire:

Merged revisions 1013810 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r1013810 | winterz | 2009-08-20 21:43:58 +0200 (Thu, 20 Aug 2009) | 7 lines
  
  Backport r1013809 by winterz from trunk to the 4.3 branch:
  
  don't crash if the calendar passed to the FreeBusy is zero.
  CCBUG: 186597
  MERGE: 4.3
........


 _M            . (directory)  
 M  +4 -1      kcal/freebusy.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,9 \
96755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013331
  + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,99 \
6755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013331,1013810
                
--- branches/kdepim/enterprise4/kdepimlibs/kcal/freebusy.cpp #1015926:1015927
@@ -104,7 +104,10 @@
   setDtEnd( end );
 
   // Get all the events in the calendar
-  Event::List eventList = d->mCalendar->rawEvents( start.date(), end.date() );
+  Event::List eventList;
+  if ( d->mCalendar ) {
+    eventList = d->mCalendar->rawEvents( start.date(), end.date() );
+  }
 
   int extraDays, i, x, duration;
   duration = start.daysTo( end );


[prev in list] [next in list] [prev in thread] [next in thread]