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

List:       kde-commits
Subject:    branches/KDE/4.1/kdepim/kontact/plugins/specialdates
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-01-03 15:18:58
Message-ID: 1230995938.529501.2614.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 904955 by tmcguire:

Backport r904913 by tmcguire from trunk to the 4.1 branch:

CCBUG: 140041
--
Merged revisions 900455 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r900455 | vkrause | 2008-12-22 22:56:18 +0100 (Mon, 22 Dec 2008) | 5 lines
  
  Remove the default resource generation code here and let
  KOrg::StdCalendar handle that instead. This gives us the same result now
  no matter if Kontact with summary plugin or KOrganizer was started
  first. Also, we no longer get duplicate resources in the first case.
........



 M  +0 -24     sdsummarywidget.cpp  


--- branches/KDE/4.1/kdepim/kontact/plugins/specialdates/sdsummarywidget.cpp #904954:904955
@@ -120,30 +120,6 @@
            this, SLOT(updateView()) );
 
   // Setup the Calendar
-  mCalendar = new KCal::CalendarResources( KPIM::KPimPrefs::timeSpec() );
-  mCalendar->readConfig();
-
-  KCal::CalendarResourceManager *manager = mCalendar->resourceManager();
-  if ( manager->isEmpty() ) {
-    KConfig _config( "korganizerrc" );
-    KConfigGroup config( &_config, "General" );
-    QString fileName = config.readPathEntry( "Active Calendar", QString() );
-
-    QString resourceName;
-    if ( fileName.isEmpty() ) {
-      fileName = KStandardDirs::locateLocal( "data", "korganizer/std.ics" );
-      resourceName = i18n( "Default KOrganizer resource" );
-    } else {
-      resourceName = i18n( "Active Calendar" );
-    }
-
-    KCal::ResourceCalendar *defaultResource = new KCal::ResourceLocal( fileName );
-
-    defaultResource->setResourceName( resourceName );
-
-    manager->add( defaultResource );
-    manager->setStandardResource( defaultResource );
-  }
   mCalendar = KOrg::StdCalendar::self();
   mCalendar->load();
 
[prev in list] [next in list] [prev in thread] [next in thread]