From 7b5410181eeba824d240b8897ebf1c1e78e6e2db Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 18 Aug 2004 19:17:54 +0000
Subject: [PATCH] Clean up the unneeded (and now broken) needsinbox stuff.

svn path=/branches/proko2/kdepim/; revision=338914
---
 accountcombobox.cpp | 16 +++-------------
 accountcombobox.h   |  5 +----
 configuredialog.cpp |  6 +++---
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/accountcombobox.cpp b/accountcombobox.cpp
index 27a22c21b..43d99c80a 100644
--- a/accountcombobox.cpp
+++ b/accountcombobox.cpp
@@ -35,8 +35,8 @@
 
 using namespace KMail;
 
-AccountComboBox::AccountComboBox( bool needsInbox, QWidget* parent, const char* name )
-  : QComboBox( parent, name ), mNeedsInbox( needsInbox )
+AccountComboBox::AccountComboBox( QWidget* parent, const char* name )
+  : QComboBox( parent, name )
 {
   connect( kmkernel->acctMgr(), SIGNAL( accountAdded( KMAccount* ) ),
            this, SLOT( slotRefreshAccounts() ) );
@@ -98,17 +98,7 @@ QValueList<KMAccount *> KMail::AccountComboBox::applicableAccounts() const
   for( KMAccount *a = kmkernel->acctMgr()->first(); a;
        a = kmkernel->acctMgr()->next() ) {
     if ( a && a->type() != "local" ) { //// ## proko2 hack. Need a list of allowed account types as ctor param
-      disconnect( a, SIGNAL(  finishedCheck(  bool, CheckStatus ) ),
-                  this, SLOT(  slotRefreshAccounts() ) );
-      bool ok = true;
-      if ( mNeedsInbox && !a->hasInbox() ) {
-        // no inbox? maybe there'll be one on the next sync
-        kdDebug() << k_funcinfo << "No INBOX in " << a->name() << " yet, waiting for sync" << endl;
-        connect(  a, SIGNAL(  finishedCheck(  bool, CheckStatus ) ),
-                  this, SLOT(  slotRefreshAccounts() ) );
-      } else {
-        lst.append( a );
-      }
+      lst.append( a );
     }
   }
   return lst;
diff --git a/accountcombobox.h b/accountcombobox.h
index ca0f4d5f1..b33e49571 100644
--- a/accountcombobox.h
+++ b/accountcombobox.h
@@ -42,8 +42,7 @@ class AccountComboBox : public QComboBox
   Q_OBJECT
 
 public:
-  /// @param needsInbox if true,
-  AccountComboBox( bool needsInbox, QWidget* parent, const char* name = 0 );
+  AccountComboBox( QWidget* parent, const char* name = 0 );
 
   void setCurrentAccount( KMAccount* account );
   KMAccount* currentAccount() const;
@@ -52,8 +51,6 @@ private slots:
   void slotRefreshAccounts();
 private:
   QValueList<KMAccount *> applicableAccounts() const;
-
-  bool mNeedsInbox;
 };
 
 
diff --git a/configuredialog.cpp b/configuredialog.cpp
index 64f5fb488..b96d2a12f 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -4120,7 +4120,7 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( QWidget* parent, const char* name )
   // Second possibility in the widgetstack: a combo showing the list of accounts
   // This is used with the kolab xml storage since the groupware folders
   // are always under the inbox.
-  mAccountCombo = new KMail::AccountComboBox( true /*needs inbox*/, mBox );
+  mAccountCombo = new KMail::AccountComboBox( mBox );
   mFolderComboStack->addWidget( mAccountCombo, 1 );
   QToolTip::add( mAccountCombo, toolTip );
   QWhatsThis::add( mAccountCombo, whatsThis );
@@ -4270,8 +4270,8 @@ void MiscPage::GroupwareTab::save() {
     // Inbox folder of the selected account
     KMAccount* acct = mAccountCombo->currentAccount();
     if (  acct ) {
-      folderId = QString( ".%1.directory/INBOX" ).arg(  acct->id() );
-      GlobalSettings::setTheIMAPResourceAccount(  acct->id() );
+      folderId = QString( ".%1.directory/INBOX" ).arg( acct->id() );
+      GlobalSettings::setTheIMAPResourceAccount( acct->id() );
     }
   }