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

List:       kde-commits
Subject:    make_it_cool: kdenetwork/kmail
From:       Don Sanders <don () sanders ! org>
Date:       2003-01-12 17:03:25
[Download RAW message or body]

CVS commit by sanders: 

Reduce diff to HEAD. Should be ok.


  M +13 -17    kmfolderdir.cpp   1.34.2.9


--- kdenetwork/kmail/kmfolderdir.cpp  #1.34.2.8:1.34.2.9
@@ -86,11 +86,11 @@ KMFolder* KMFolderDir::createFolder(cons
 
   assert(!aFolderName.isEmpty());
-  if ( mDirType == KMImapDir && aFolderType != KMFolderTypeCachedImap ) {
-    fld = new KMFolderImap(this, aFolderName);
-  } else if (aFolderType == KMFolderTypeCachedImap ) {
+  if (aFolderType == KMFolderTypeCachedImap )
     fld = new KMFolderCachedImap(this, aFolderName);
-  } else if (aFolderType == KMFolderTypeMaildir) {
+  else if (mDirType == KMImapDir)
+    fld = new KMFolderImap(this, aFolderName);
+  else if (aFolderType == KMFolderTypeMaildir)
     fld = new KMFolderMaildir(this, aFolderName);
-  } else if (aFolderType == KMFolderTypeSearch)
+  else if (aFolderType == KMFolderTypeSearch)
     fld = new KMFolderSearch(this, aFolderName);
   else
@@ -195,13 +195,10 @@ bool KMFolderDir::reload(void)
           && ( dir.exists( imapcachefile) || dir.exists( maildir ) ) )
       {
-        // kdDebug() << "KMFolderDir creating new CachedImap folder with name " << fname << endl;
+        kdDebug() << "KMFolderDir creating new CachedImap folder with name " << fname << endl;
         folder = new KMFolderCachedImap(this, fname);
         append(folder);
         folderList.append(folder);
-      } else {
-        // kdDebug() << fname << " is *not* a cached imap dir" << endl;
+      } else if ((mDirType != KMImapDir) && dir.exists(maildir)) {
         // see if this is a maildir before assuming a subdir
-        if ((mDirType != KMImapDir) && dir.exists(maildir))
-        {
           folder = new KMFolderMaildir(this, fname);
           append(folder);
@@ -210,5 +207,4 @@ bool KMFolderDir::reload(void)
         else
           diList.append(fname);
-      }
     }
     else if (mDirType == KMImapDir)


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