Attachment #113654 for bug #171346




           this, SLOT(slotEditNotifications()) );
}

AccountsPageReceivingTab::~AccountsPageReceivingTab()
{
  // When hitting Cancel or closing the dialog with the window-manager-button,
  // we have a number of things to clean up:

  // The newly created accounts
  QValueList< QGuardedPtr<KMAccount> >::Iterator it;
  for (it = mNewAccounts.begin(); it != mNewAccounts.end(); ++it ) {
    delete (*it);
  }
  mNewAccounts.clear();

  // The modified accounts
  QValueList<ModifiedAccountsType*>::Iterator j;
  for ( j = mModifiedAccounts.begin() ; j != mModifiedAccounts.end() ; ++j ) {
    delete (*j)->newAccount;
    delete (*j);
  }
  mModifiedAccounts.clear();


}

void AccountsPage::ReceivingTab::slotAccountSelected()
{

  // Add accounts marked as new
  QValueList< QGuardedPtr<KMAccount> >::Iterator it;
  for (it = mNewAccounts.begin(); it != mNewAccounts.end(); ++it ) {
    kmkernel->acctMgr()->add( *it ); // calls installTimer too
    (*it)->installTimer();
  }

  // Update accounts that have been modified

Lines 349-354 Link Here

(-)branches/KDE/3.5/kdepim/kmail/configuredialog_p.h (-1 / +2 lines)
349	Q_OBJECT	349	Q_OBJECT
350	public:	350	public:
351	AccountsPageReceivingTab( QWidget * parent=0, const char * name=0 );	351	AccountsPageReceivingTab( QWidget * parent=0, const char * name=0 );
		352	~AccountsPageReceivingTab();
352	QString helpAnchor() const;	353	QString helpAnchor() const;
353	void save();	354	void save();
354		355
Lines 384-390 Link Here
384	QGuardedPtr< KMAccount > oldAccount;	385	QGuardedPtr< KMAccount > oldAccount;
385	QGuardedPtr< KMAccount > newAccount;	386	QGuardedPtr< KMAccount > newAccount;
386	};	387	};
387	// ### make this a qptrlist:	388	// ### make this value-based:
388	QValueList< ModifiedAccountsType* > mModifiedAccounts;	389	QValueList< ModifiedAccountsType* > mModifiedAccounts;
389	};	390	};
390		391




  {
    setFolder(kmkernel->folderMgr()->findIdString(folderName), true);
  }

  if (mInterval == 0)
    deinstallTimer();
  else
    installTimer();
}



void KMAccount::setCheckInterval(int aInterval)
{
  if (aInterval <= 0)
  {
    mInterval = 0;
    deinstallTimer();
  }
  else
  {
    mInterval = aInterval;
  // Don't call installTimer from here! See #117935.
  }
}

//----------------------------------------------------------------------------

Return to bug 171346

Lines 1147-1152 Link Here

(-)branches/KDE/3.5/kdepim/kmail/configuredialog.cpp (-2 / +23 lines)
1147	this, SLOT(slotEditNotifications()) );	1147	this, SLOT(slotEditNotifications()) );
1148	}	1148	}
1149		1149
		1150	AccountsPageReceivingTab::~AccountsPageReceivingTab()
		1151	{
		1152	// When hitting Cancel or closing the dialog with the window-manager-button,
		1153	// we have a number of things to clean up:
		1154
		1155	// The newly created accounts
		1156	QValueList< QGuardedPtr<KMAccount> >::Iterator it;
		1157	for (it = mNewAccounts.begin(); it != mNewAccounts.end(); ++it ) {
		1158	delete (*it);
		1159	}
		1160	mNewAccounts.clear();
		1161
		1162	// The modified accounts
		1163	QValueList<ModifiedAccountsType*>::Iterator j;
		1164	for ( j = mModifiedAccounts.begin() ; j != mModifiedAccounts.end() ; ++j ) {
		1165	delete (*j)->newAccount;
		1166	delete (*j);
		1167	}
		1168	mModifiedAccounts.clear();
		1169
		1170
		1171	}
1150		1172
1151	void AccountsPage::ReceivingTab::slotAccountSelected()	1173	void AccountsPage::ReceivingTab::slotAccountSelected()
1152	{	1174	{
Lines 1398-1405 Link Here
1398	// Add accounts marked as new	1420	// Add accounts marked as new
1399	QValueList< QGuardedPtr<KMAccount> >::Iterator it;	1421	QValueList< QGuardedPtr<KMAccount> >::Iterator it;
1400	for (it = mNewAccounts.begin(); it != mNewAccounts.end(); ++it ) {	1422	for (it = mNewAccounts.begin(); it != mNewAccounts.end(); ++it ) {
1401	kmkernel->acctMgr()->add( *it );	1423	kmkernel->acctMgr()->add( *it ); // calls installTimer too
1402	(*it)->installTimer();
1403	}	1424	}
1404		1425
1405	// Update accounts that have been modified	1426	// Update accounts that have been modified

Lines 151-156 Link Here

(-)branches/KDE/3.5/kdepim/kmail/kmaccount.cpp (-6 / +6 lines)
151	{	151	{
152	setFolder(kmkernel->folderMgr()->findIdString(folderName), true);	152	setFolder(kmkernel->folderMgr()->findIdString(folderName), true);
153	}	153	}
		154
		155	if (mInterval == 0)
		156	deinstallTimer();
		157	else
		158	installTimer();
154	}	159	}
155		160
156		161
Lines 278-292 Link Here
278	void KMAccount::setCheckInterval(int aInterval)	283	void KMAccount::setCheckInterval(int aInterval)
279	{	284	{
280	if (aInterval <= 0)	285	if (aInterval <= 0)
281	{
282	mInterval = 0;	286	mInterval = 0;
283	deinstallTimer();
284	}
285	else	287	else
286	{
287	mInterval = aInterval;	288	mInterval = aInterval;
288	installTimer();	289	// Don't call installTimer from here! See #117935.
289	}
290	}	290	}
291		291
292	//----------------------------------------------------------------------------	292	//----------------------------------------------------------------------------