* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 4 deletions

diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 0c4956bd4..81b53c1f6 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -47,6 +47,7 @@ TimeLabels::TimeLabels(int rows,TQWidget *parent,const char *name,WFlags f) :
 {
   mRows = rows;
   mMiniWidth = 0;
+  mAgenda = 0;
 
   mCellHeight = KOPrefs::instance()->mHourSize*4;
 
@@ -204,16 +205,19 @@ void TimeLabels::updateConfig()
   // If the agenda is zoomed out so that more then 24 would be shown,
   // the agenda only shows 24 hours, so we need to take the cell height
   // from the agenda, which is larger than the configured one!
-  if ( mCellHeight < 4*mAgenda->gridSpacingY() )
+  if ( mAgenda && mCellHeight < 4*mAgenda->gridSpacingY() ) {
        mCellHeight = 4*mAgenda->gridSpacingY();
+  }
   resizeContents( mMiniWidth, int(mRows * mCellHeight+1) );
 }
 
 /** update time label positions */
 void TimeLabels::positionChanged()
 {
-  int adjustment = mAgenda->contentsY();
-  setContentsPos(0, adjustment);
+  if ( mAgenda ) {
+    int adjustment = mAgenda->contentsY();
+    setContentsPos( 0, adjustment );
+  }
 }
 
 void TimeLabels::positionChanged( int pos )
@@ -222,7 +226,7 @@ void TimeLabels::positionChanged( int pos )
 }
 
 /**  */
-void TimeLabels::setAgenda(KOAgenda* agenda)
+void TimeLabels::setAgenda( KOAgenda* agenda )
 {
   mAgenda = agenda;