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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/kmail
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2004-08-13 7:02:55
Message-ID: 20040813070255.D5A5E9A73 () office ! kde ! org
[Download RAW message or body]

CVS commit by thorsen: 

Backport from proko2_branch: Check for the folders with the right foldername.


  M +5 -5      kmailicalifaceimpl.cpp   1.55.2.1


--- kdepim/kmail/kmailicalifaceimpl.cpp  #1.55:1.55.2.1
@@ -741,25 +741,25 @@ void KMailICalIfaceImpl::readConfig()
   bool makeSubFolders = false;
   KMFolderNode* node;
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Calendar ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Calendar, folderLanguage ) );
   if( !node || node->isDir() ) {
     makeSubFolders = true;
     mCalendar = 0;
   }
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Tasks ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Tasks, folderLanguage ) );
   if( !node || node->isDir() ) {
     makeSubFolders = true;
     mTasks = 0;
   }
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Journals ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Journals, folderLanguage ) );
   if( !node || node->isDir() ) {
     makeSubFolders = true;
     mJournals = 0;
   }
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Contacts ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Contacts, folderLanguage ) );
   if( !node || node->isDir() ) {
     makeSubFolders = true;
     mContacts = 0;
   }
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Notes ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Notes, folderLanguage ) );
   if( !node || node->isDir() ) {
     makeSubFolders = true;


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