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

List:       kmail-devel
Subject:    Re: make_it_cool -> HEAD?
From:       Stephan Kulow <coolo () kde ! org>
Date:       2002-12-01 15:59:29
[Download RAW message or body]

On Freitag, 29. November 2002 20:38, Stephan Kulow wrote:
> On Freitag, 29. November 2002 20:10, Bo Thorsen wrote:
> > > Please commit. If conflicts arise I will tell you :)
> >
> > Done.
> >
> > Now I'll go hide :-)
>
> 4 remaining chunks. I guess they arise because of Zack's IMAP
> cleanup. The rest of your changes I commited to make_it_cool
> branch so you can check out that branch and port the remaining
> chunks. OK?
>
To get a working kmail I applied the following patch to make_it_cool
(but haven't yet commited). But as monday comes closer I would
commit the patch. So to get cached imap working you need to do 
some more work I'm afraid ;(

Greetings, Stephan


["patch" (text/x-diff)]

? patch
Index: kmfolderdia.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmfolderdia.cpp,v
retrieving revision 1.81
diff -u -3 -p -r1.81 kmfolderdia.cpp
--- kmfolderdia.cpp	2002/11/29 19:08:24	1.81
+++ kmfolderdia.cpp	2002/11/29 19:31:22
@@ -516,8 +516,6 @@ void KMFolderDialog::slotOk()
          */
         folder = (KMAcctFolder*) new KMFolderImap(mFolderDir, fldName);
         static_cast<KMFolderImap*>(selectedFolder)->createFolder(fldName);
-      } else if (selectedFolder && selectedFolder->protocol() == "cachedimap"){
-	folder = (KMAcctFolder*)kernel->imapFolderMgr()->createFolder( fldName, FALSE, \
KMFolderTypeCachedImap, selectedFolderDir );  } else if (mailboxType->currentItem() \
                == 1) {
         folder = (KMAcctFolder*)kernel->folderMgr()->createFolder(fldName, FALSE, \
KMFolderTypeMaildir, selectedFolderDir );  } else {
Index: kmfolderdir.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmfolderdir.cpp,v
retrieving revision 1.36
diff -u -3 -p -r1.36 kmfolderdir.cpp
--- kmfolderdir.cpp	2002/11/29 19:08:24	1.36
+++ kmfolderdir.cpp	2002/11/29 19:31:22
@@ -6,14 +6,12 @@
 #include "kmfolderdir.h"
 #include "kmfoldermaildir.h"
 #include "kmfolderimap.h"
-#include "kmfoldercachedimap.h"
 
 #include <assert.h>
 #include <errno.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
 
 
 //=============================================================================
@@ -175,29 +173,15 @@ bool KMFolderDir::reload(void)
     else if (fileInfo->isDir()) // a directory
     {
       QString maildir(fname + "/new");
-      QString imapcachefile = QString::fromLatin1(".%1.uidcache").arg(fname);
-
-      // For this to be a cached IMAP folder, it must be in the KMail imap
-      // subdir and must be have a uidcache file or be a maildir folder
-      if( path().startsWith( locateLocal("appdata", "imap") )
-	  && ( dir.exists( imapcachefile) || dir.exists( maildir ) ) )
+      // see if this is a maildir before assuming a subdir
+      if (!mImap && dir.exists(maildir))
       {
-	kdDebug() << "KMFolderDir creating new CachedImap folder with name " << fname << \
                endl;
-	folder = new KMFolderCachedImap(this, fname);
+        folder = new KMFolderMaildir(this, fname);
         append(folder);
         folderList.append(folder);
-      } else {
-	kdDebug() << fname << " is *not* a cached imap dir" << endl;
-	// see if this is a maildir before assuming a subdir
-	if (!mImap && dir.exists(maildir))
-	{
-	  folder = new KMFolderMaildir(this, fname);
-	  append(folder);
-	  folderList.append(folder);
-	}
-	else
-	  diList.append(fname);
       }
+      else
+        diList.append(fname);
     }
     else if (mImap)
     {
Index: kmmainwin.cpp
===================================================================
RCS file: /home/kde/kdenetwork/kmail/kmmainwin.cpp,v
retrieving revision 1.544
diff -u -3 -p -r1.544 kmmainwin.cpp
--- kmmainwin.cpp	2002/11/29 19:08:25	1.544
+++ kmmainwin.cpp	2002/11/29 19:31:22
@@ -1099,8 +1099,6 @@ void KMMainWin::slotRemoveFolder()
     }
     if (mFolder->protocol() == "imap")
       static_cast<KMFolderImap*>(mFolder)->removeOnServer();
-    else if (mFolder->protocol() == "cachedimap")
-      kernel->imapFolderMgr()->remove(mFolder);
     else
       kernel->folderMgr()->remove(mFolder);
   }


_______________________________________________
KMail Developers mailing list
kmail@mail.kde.org
http://mail.kde.org/mailman/listinfo/kmail

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