CVS commit by thorsen: 

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


  M +8 -8      kmailicalifaceimpl.cpp   1.29.2.1


--- kdepim/kmail/kmailicalifaceimpl.cpp  #1.29:1.29.2.1
@@ -483,13 +483,13 @@ 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;
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Tasks ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Tasks, folderLanguage ) );
   if( !node || node->isDir() ) makeSubFolders = true;
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Journals ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Journals, folderLanguage ) );
   if( !node || node->isDir() ) makeSubFolders = true;
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Contacts ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Contacts, folderLanguage ) );
   if( !node || node->isDir() ) makeSubFolders = true;
-  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Notes ) );
+  node = folderParentDir->hasNamedFolder( folderName( KFolderTreeItem::Notes, folderLanguage ) );
   if( !node || node->isDir() ) makeSubFolders = true;
   if( makeSubFolders ) {