openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r904955.diff of Package kdepim4

Subject: korganizer: fix duplicate default resources
From: wstephenson@suse.de
Bug: bnc#116351

Patch-upstream: 904955
--- kontact/plugins/specialdates/sdsummarywidget.cpp	(revision 904954)
+++ kontact/plugins/specialdates/sdsummarywidget.cpp	(revision 904955)
@@ -120,30 +120,6 @@ SDSummaryWidget::SDSummaryWidget( Kontac
            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();
 
Index: kontact/plugins/specialdates/sdsummarywidget.cpp
===================================================================

Places

File r904955.diff of Package kdepim4

Places