From a74d1926b095509f731b2518c699996ead2fc712 Mon Sep 17 00:00:00 2001
From: Pradeepto Bhattacharya <pradeepto@kde.org>
Date: Fri, 25 May 2007 06:36:30 +0000
Subject: [PATCH] Merge ... SVN commit 648600 by kloecker:

This if-statement is obsolete because it is always true. It was added 6 years ago because
KIO::del didn't have the data signal, but in the current code we use KIO::get for everything.

SVN commit 648597 by kloecker:

Change the type of stage from int to Stage, reflecting what that variable always holds.
Patch by Sam Bishop.

svn path=/branches/kdepim/enterprise/kdepim/; revision=668133
---
 popaccount.cpp | 1 -
 popaccount.h   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/popaccount.cpp b/popaccount.cpp
index 3bc21308b..817c4aab1 100644
--- a/popaccount.cpp
+++ b/popaccount.cpp
@@ -285,7 +285,6 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize)
 //-----------------------------------------------------------------------------
 void PopAccount::connectJob() {
   KIO::Scheduler::assignJobToSlave(mSlave, job);
-  if (stage != Dele)
   connect(job, SIGNAL( data( KIO::Job*, const QByteArray &)),
          SLOT( slotData( KIO::Job*, const QByteArray &)));
   connect(job, SIGNAL( result( KIO::Job * ) ),
diff --git a/popaccount.h b/popaccount.h
index 18eee3364..887436a2f 100644
--- a/popaccount.h
+++ b/popaccount.h
@@ -160,7 +160,7 @@ protected:
   QDataStream *curMsgStrm;
 
   int curMsgLen;
-  int stage;
+  Stage stage;
   QTimer processMsgsTimer;
   int processingDelay;
   int numMsgs, numBytes, numBytesToRead, numBytesRead, numMsgBytesRead;