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

List:       kde-commits
Subject:    kroupware_branch: kdenetwork/kmail
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2003-01-04 0:20:26
[Download RAW message or body]

CVS commit by thorsen: 

Remove ugly foldertype setup hack


  M +2 -1      kmfoldertype.h   1.1.2.2
  M +4 -1      kmgroupware.cpp   1.1.2.154


--- kdenetwork/kmail/kmfoldertype.h  #1.1.2.1:1.1.2.2
@@ -7,5 +7,6 @@ typedef enum
   KMFolderTypeMaildir,
   KMFolderTypeCachedImap,
-  KMFolderTypeImap
+  KMFolderTypeImap,
+  KMFolderTypeUnknown
 } KMFolderType;
 

--- kdenetwork/kmail/kmgroupware.cpp  #1.1.2.153:1.1.2.154
@@ -76,4 +76,5 @@ KMGroupware::KMGroupware( QObject* paren
     mKOrgPart(0),
     mFolderParent(0),
+    mFolderType(KMFolderTypeUnknown),
     mContactsLocked(false),
     mContacts(0),
@@ -285,5 +286,7 @@ void KMGroupware::initFolders()
 {
   if( mUseGroupware && mFolderParent ){
-    KMFolderType type = mFolderType ?KMFolderTypeCachedImap:KMFolderTypeMaildir; /* HACK */
+    KMFolderType type = mFolderType;
+    if( type == KMFolderTypeUnknown )
+      type = KMFolderTypeMaildir;
     KMFolderNode* node = mFolderParent->hasNamedFolder( folderName( KFolderTreeItem::Contacts ) );
     if( node && !node->isDir() ) mContacts = static_cast<KMFolder*>(node);


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