[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdepim
From: Volker Krause <vkrause () kde ! org>
Date: 2008-08-18 17:35:34
Message-ID: 1219080934.573825.19461.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 848902 by vkrause:
Merged revisions 804616 via svnmerge from
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r804616 | ervin | 2008-05-06 18:04:47 +0200 (Tue, 06 May 2008) | 7 lines
Disable all UI activity of the sievejob checking for the vacation script
on startup.
Backport of 804287 in trunk.
Should fix kolab/issue2560.
........
_M . (directory)
M +29 -12 kmail/sievejob.cpp
M +8 -3 kmail/sievejob.h
M +1 -1 kmail/vacation.cpp
** branches/KDE/3.5/kdepim #property svnmerge-integrated
- /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,76794 \
8-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,775 \
196-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,7 \
78031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780250 \
-780452,780454-780495,780497,780499-780529,780531-782028,782030-783127,783129-783243,783245,7832 \
48-783477,783479-784380,784382-784426,784428-784691,784693-785478,785480-785558,787827,788634,78 \
9925,790349-790352,791184-791440,791443-792201,792203-792957,793296,794734,795745-795763,795765, \
795767-798445,798447-798448,798450-798495,798497-800070,800072-800167,800169-802138,802140-80214 \
8,802150-802151,802153-803259,803261-803299,803301-803308,803310-803380,803383-803397,803399-804 \
615,804617-804993,804995-805347,805349-805427,805429-805459,805461-805702,807761-809708,809710-810236,810238-810302,810304,810
306-811205,811207-813547,813549-814372,814374,814376-816024,816026-816313,816315-816322,816324 \
-817070,817072-817087,817089-817101,817103-819076,819078-820073,820075-821035,821037-821124,8211 \
26-821378,821380-821648,821650-821835,821837-822268,822270-824217,824219-824277,824279-824285,82 \
4287-825075,825077-825083,825085-826354,826356-827612,827614-827891,827893-827944,827946-827949,827951-829033,829035-830477,830479-830875,830877-830932,830934-834241
+ /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,767948 \
-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,7751 \
96-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,77 \
8031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780250- \
780452,780454-780495,780497,780499-780529,780531-782028,782030-783127,783129-783243,783245,78324 \
8-783477,783479-784380,784382-784426,784428-784691,784693-785478,785480-785558,787827,788634,789 \
925,790349-790352,791184-791440,791443-792201,792203-792957,793296,794734,795745-795763,795765,7 \
95767-798445,798447-798448,798450-798495,798497-800070,800072-800167,800169-802138,802140-802148 \
,802150-802151,802153-803259,803261-803299,803301-803308,803310-803380,803383-803397,803399-8049 \
93,804995-805347,805349-805427,805429-805459,805461-805702,807761-809708,809710-810236,810238-810302,810304,810306-811205,811
207-813547,813549-814372,814374,814376-816024,816026-816313,816315-816322,816324-817070,817072 \
-817087,817089-817101,817103-819076,819078-820073,820075-821035,821037-821124,821126-821378,8213 \
80-821648,821650-821835,821837-822268,822270-824217,824219-824277,824279-824285,824287-825075,82 \
5077-825083,825085-826354,826356-827612,827614-827891,827893-827944,827946-827949,827951-829033,829035-830477,830479-830875,830877-830932,830934-834241
--- branches/KDE/3.5/kdepim/kmail/sievejob.cpp #848901:848902
@@ -37,12 +37,26 @@
QObject * parent, const char * name )
: QObject( parent, name ),
mUrl( url ), mJob( 0 ), mDec( 0 ),
- mScript( script ), mFileExists( DontKnow ), mCommands( commands )
+ mScript( script ), mFileExists( DontKnow ), mCommands( commands ),
+ mShowProgressInfo(true)
{
assert( !commands.isEmpty() );
- schedule( commands.top() );
+ schedule( commands.top(), true );
}
+ SieveJob::SieveJob( const KURL & url, const QString & script,
+ const QValueStack<Command> & commands,
+ bool showProgressInfo,
+ QObject * parent, const char * name )
+ : QObject( parent, name ),
+ mUrl( url ), mJob( 0 ), mDec( 0 ),
+ mScript( script ), mFileExists( DontKnow ), mCommands( commands ),
+ mShowProgressInfo(showProgressInfo)
+ {
+ assert( !commands.isEmpty() );
+ schedule( commands.top(), showProgressInfo );
+ }
+
SieveJob::~SieveJob() {
kill();
delete mDec;
@@ -53,17 +67,17 @@
if ( mJob ) mJob->kill( quiet );
}
- void SieveJob::schedule( Command command ) {
+ void SieveJob::schedule( Command command, bool showProgressInfo ) {
switch ( command ) {
case Get:
kdDebug(5006) << "SieveJob::schedule: get( " << mUrl.prettyURL() << " )" << endl;
- mJob = KIO::get( mUrl );
+ mJob = KIO::get( mUrl, false /*reload*/, showProgressInfo );
connect( mJob, SIGNAL(data(KIO::Job*,const QByteArray&)),
SLOT(slotData(KIO::Job*,const QByteArray&)) );
break;
case Put:
kdDebug(5006) << "SieveJob::schedule: put( " << mUrl.prettyURL() << " )" << endl;
- mJob = KIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/ );
+ mJob = KIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo );
connect( mJob, SIGNAL(dataReq(KIO::Job*,QByteArray&)),
SLOT(slotDataReq(KIO::Job*,QByteArray&)) );
break;
@@ -87,7 +101,7 @@
url.setQuery( query );
kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL()
<< endl;
- mJob = KIO::listDir( url );
+ mJob = KIO::listDir( url, showProgressInfo );
connect( mJob, SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)),
SLOT(slotEntries(KIO::Job*,const KIO::UDSEntryList&)) );
break;
@@ -95,18 +109,19 @@
case List:
kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl;
{
- mJob = KIO::listDir( mUrl );
+ mJob = KIO::listDir( mUrl, showProgressInfo );
connect( mJob, SIGNAL( entries(KIO::Job *, const KIO::UDSEntryList & ) ),
SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList & ) ) );
break;
}
case Delete:
kdDebug(5006) << "SieveJob::schedule: delete( " << mUrl.prettyURL() << " )" << endl;
- mJob = KIO::del( mUrl );
+ mJob = KIO::del( mUrl, false/*shred*/, showProgressInfo );
break;
default:
assert( 0 );
}
+ mJob->setInteractive(showProgressInfo);
// common to all jobs:
connect( mJob, SIGNAL(result(KIO::Job*)), SLOT(slotResult(KIO::Job*)) );
}
@@ -189,7 +204,9 @@
// check for errors:
if ( job->error() ) {
- job->showErrorDialog( 0 );
+ if ( job->isInteractive() ) {
+ job->showErrorDialog( 0 );
+ }
emit result( this, false, mScript, mUrl.fileName() == mActiveScriptName );
@@ -225,7 +242,7 @@
return;
} else {
// schedule the next command:
- schedule( mCommands.top() );
+ schedule( mCommands.top(), mShowProgressInfo );
}
}
@@ -240,11 +257,11 @@
return new SieveJob( dest, script, commands );
}
- SieveJob * SieveJob::get( const KURL & src ) {
+ SieveJob * SieveJob::get( const KURL & src, bool showProgressInfo ) {
QValueStack<Command> commands;
commands.push( Get );
commands.push( SearchActive );
- return new SieveJob( src, QString::null, commands );
+ return new SieveJob( src, QString::null, commands, showProgressInfo );
}
SieveJob * SieveJob::list( const KURL & src ) {
--- branches/KDE/3.5/kdepim/kmail/sievejob.h #848901:848902
@@ -38,6 +38,10 @@
SieveJob( const KURL & url, const QString & script,
const QValueStack<Command> & commands,
QObject * parent=0, const char * name=0 );
+ SieveJob( const KURL & url, const QString & script,
+ const QValueStack<Command> & commands,
+ bool showProgressInfo,
+ QObject * parent=0, const char * name=0 );
virtual ~SieveJob();
public:
@@ -53,7 +57,7 @@
/**
* Get a specific Sieve script
*/
- static SieveJob * get( const KURL & src );
+ static SieveJob * get( const KURL & src, bool showProgressInfo=true );
/**
* List all available scripts
@@ -87,14 +91,14 @@
*/
void gotList( KMail::SieveJob *job, bool success,
const QStringList &scriptList, const QString &activeScript );
-
+
void result( KMail::SieveJob * job, bool success,
const QString & script, bool active );
void item( KMail::SieveJob * job, const QString & filename, bool active );
protected:
- void schedule( Command command );
+ void schedule( Command command, bool showProgressInfo );
protected slots:
void slotData( KIO::Job *, const QByteArray & ); // for get
@@ -111,6 +115,7 @@
Existence mFileExists;
QStringList mSieveCapabilities;
QValueStack<Command> mCommands;
+ bool mShowProgressInfo;
// List of Sieve scripts on the server, used by @ref list()
QStringList mAvailableScripts;
--- branches/KDE/3.5/kdepim/kmail/vacation.cpp #848901:848902
@@ -435,7 +435,7 @@
kdDebug(5006) << "Vacation: found url \"" << mUrl.prettyURL() << "\"" << endl;
if ( mUrl.isEmpty() ) // nothing to do...
return;
- mSieveJob = SieveJob::get( mUrl );
+ mSieveJob = SieveJob::get( mUrl, !checkOnly );
connect( mSieveJob, SIGNAL(gotScript(KMail::SieveJob*,bool,const QString&,bool)),
SLOT(slotGetResult(KMail::SieveJob*,bool,const QString&,bool)) );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic