diff --git a/akonadi/agentbase.cpp b/akonadi/agentbase.cpp
index 0a6ffa699..ad03b69e0 100644
--- a/akonadi/agentbase.cpp
+++ b/akonadi/agentbase.cpp
@@ -1,720 +1,716 @@
 /*
     Copyright (c) 2006 Till Adam <adam@kde.org>
     Copyright (c) 2007 Volker Krause <vkrause@kde.org>
     Copyright (c) 2007 Bruno Virlet <bruno.virlet@gmail.com>
     Copyright (c) 2008 Kevin Krammer <kevin.krammer@gmx.at>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "agentbase.h"
 #include "agentbase_p.h"
 
 #include "changerecorder.h"
 #include "controladaptor.h"
 #include "itemfetchjob.h"
 #include "monitor_p.h"
 #include "servermanager_p.h"
 #include "session.h"
 #include "session_p.h"
 #include "statusadaptor.h"
 #include "xdgbasedirs_p.h"
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include <QtCore/QDir>
 #include <QtCore/QSettings>
 #include <QtCore/QTimer>
 #include <QtDBus/QtDBus>
 #include <QtGui/QApplication>
 
 #include <signal.h>
 #include <stdlib.h>
 
 using namespace Akonadi;
 
 static AgentBase *sAgentBase = 0;
 
 AgentBase::Observer::Observer()
 {
 }
 
 AgentBase::Observer::~Observer()
 {
 }
 
 void AgentBase::Observer::itemAdded( const Item &item, const Collection &collection )
 {
   Q_UNUSED( item );
   Q_UNUSED( collection );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::Observer::itemChanged( const Item &item, const QSet<QByteArray> &partIdentifiers )
 {
   Q_UNUSED( item );
   Q_UNUSED( partIdentifiers );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::Observer::itemRemoved( const Item &item )
 {
   Q_UNUSED( item );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::Observer::collectionAdded( const Akonadi::Collection &collection, const Akonadi::Collection &parent )
 {
   Q_UNUSED( collection );
   Q_UNUSED( parent );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::Observer::collectionChanged( const Collection &collection )
 {
   Q_UNUSED( collection );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::Observer::collectionRemoved( const Collection &collection )
 {
   Q_UNUSED( collection );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::ObserverV2::itemMoved( const Akonadi::Item &item, const Akonadi::Collection &source, const Akonadi::Collection &dest )
 {
   Q_UNUSED( item );
   Q_UNUSED( source );
   Q_UNUSED( dest );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::ObserverV2::itemLinked( const Akonadi::Item& item, const Akonadi::Collection& collection )
 {
   Q_UNUSED( item );
   Q_UNUSED( collection );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::ObserverV2::itemUnlinked( const Akonadi::Item& item, const Akonadi::Collection& collection )
 {
   Q_UNUSED( item );
   Q_UNUSED( collection );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::ObserverV2::collectionMoved( const Akonadi::Collection &collection, const Akonadi::Collection &source, const Akonadi::Collection &dest )
 {
   Q_UNUSED( collection );
   Q_UNUSED( source );
   Q_UNUSED( dest );
   if ( sAgentBase != 0 )
     sAgentBase->d_ptr->changeProcessed();
 }
 
 void AgentBase::ObserverV2::collectionChanged( const Akonadi::Collection &collection, const QSet<QByteArray> &partIdentifiers )
 {
   Q_UNUSED( partIdentifiers );
   collectionChanged( collection );
 }
 
 //@cond PRIVATE
 
 AgentBasePrivate::AgentBasePrivate( AgentBase *parent )
   : q_ptr( parent ),
     mStatusCode( AgentBase::Idle ),
     mProgress( 0 ),
     mNeedsNetwork( false ),
     mOnline( false ),
     mSettings( 0 ),
     mObserver( 0 )
 {
   Internal::setClientType( Internal::Agent );
 }
 
 AgentBasePrivate::~AgentBasePrivate()
 {
   mChangeRecorder->setConfig( 0 );
   delete mSettings;
 }
 
 void AgentBasePrivate::init()
 {
   Q_Q( AgentBase );
 
   /**
    * Create a default session for this process.
    */
   SessionPrivate::createDefaultSession( mId.toLatin1() );
 
   mTracer = new org::freedesktop::Akonadi::Tracer( QLatin1String( "org.freedesktop.Akonadi" ), QLatin1String( "/tracing" ),
                                            QDBusConnection::sessionBus(), q );
 
   new Akonadi__ControlAdaptor( q );
   new Akonadi__StatusAdaptor( q );
   if ( !QDBusConnection::sessionBus().registerObject( QLatin1String( "/" ), q, QDBusConnection::ExportAdaptors ) )
     q->error( QString::fromLatin1( "Unable to register object at dbus: %1" ).arg( QDBusConnection::sessionBus().lastError().message() ) );
 
   mSettings = new QSettings( QString::fromLatin1( "%1/agent_config_%2" ).arg( XdgBaseDirs::saveDir( "config", QLatin1String( "akonadi" ) ), mId ), QSettings::IniFormat );
 
   mChangeRecorder = new ChangeRecorder( q );
   mChangeRecorder->ignoreSession( Session::defaultSession() );
   mChangeRecorder->itemFetchScope().setCacheOnly( true );
   mChangeRecorder->setConfig( mSettings );
 
   mOnline = mSettings->value( QLatin1String( "Agent/Online" ), true ).toBool();
 
   // reinitialize the status message now that online state is available
   mStatusMessage = defaultReadyMessage();
 
   mName = mSettings->value( QLatin1String( "Agent/Name" ) ).toString();
   if ( mName.isEmpty() ) {
     mName = mSettings->value( QLatin1String( "Resource/Name" ) ).toString();
     if ( !mName.isEmpty() ) {
       mSettings->remove( QLatin1String( "Resource/Name" ) );
       mSettings->setValue( QLatin1String( "Agent/Name" ), mName );
     }
   }
 
   connect( mChangeRecorder, SIGNAL( itemAdded( const Akonadi::Item&, const Akonadi::Collection& ) ),
            SLOT( itemAdded( const Akonadi::Item&, const Akonadi::Collection& ) ) );
   connect( mChangeRecorder, SIGNAL( itemChanged( const Akonadi::Item&, const QSet<QByteArray>& ) ),
            SLOT( itemChanged( const Akonadi::Item&, const QSet<QByteArray>& ) ) );
   connect( mChangeRecorder, SIGNAL( itemMoved( const Akonadi::Item&, const Akonadi::Collection&, const Akonadi::Collection& ) ),
            SLOT( itemMoved( const Akonadi::Item&, const Akonadi::Collection&, const Akonadi::Collection& ) ) );
   connect( mChangeRecorder, SIGNAL( itemRemoved( const Akonadi::Item& ) ),
            SLOT( itemRemoved( const Akonadi::Item& ) ) );
   connect( mChangeRecorder, SIGNAL( collectionAdded( const Akonadi::Collection&, const Akonadi::Collection& ) ),
            SLOT( collectionAdded( const Akonadi::Collection&, const Akonadi::Collection& ) ) );
   connect( mChangeRecorder, SIGNAL( itemLinked( const Akonadi::Item&, const Akonadi::Collection& ) ),
            SLOT( itemLinked( const Akonadi::Item&, const Akonadi::Collection& ) ) );
   connect( mChangeRecorder, SIGNAL( itemUnlinked( const Akonadi::Item&, const Akonadi::Collection& ) ),
            SLOT( itemUnlinked( const Akonadi::Item&, const Akonadi::Collection& ) ) );
   connect( mChangeRecorder, SIGNAL( collectionChanged( const Akonadi::Collection& ) ),
            SLOT( collectionChanged( const Akonadi::Collection& ) ) );
   connect( mChangeRecorder, SIGNAL( collectionChanged( const Akonadi::Collection&, const QSet<QByteArray>& ) ),
            SLOT( collectionChanged( const Akonadi::Collection&, const QSet<QByteArray>& ) ) );
   connect( mChangeRecorder, SIGNAL( collectionMoved( const Akonadi::Collection&, const Akonadi::Collection&, const Akonadi::Collection& ) ),
            SLOT( collectionMoved( const Akonadi::Collection&, const Akonadi::Collection&, const Akonadi::Collection& ) ) );
   connect( mChangeRecorder, SIGNAL( collectionRemoved( const Akonadi::Collection& ) ),
            SLOT( collectionRemoved( const Akonadi::Collection& ) ) );
 
   connect( q, SIGNAL( status( int, const QString& ) ), q, SLOT( slotStatus( int, const QString& ) ) );
   connect( q, SIGNAL( percent( int ) ), q, SLOT( slotPercent( int ) ) );
   connect( q, SIGNAL( warning( const QString& ) ), q, SLOT( slotWarning( const QString& ) ) );
   connect( q, SIGNAL( error( const QString& ) ), q, SLOT( slotError( const QString& ) ) );
 
   // Use reference counting to allow agents to finish internal jobs when the
   // agent is stopped.
   KGlobal::ref();
   KGlobal::setAllowQuit( true );
 
   // disable session management
   if ( KApplication::kApplication() )
     KApplication::kApplication()->disableSessionManagement();
 
   QTimer::singleShot( 0, q, SLOT( delayedInit() ) );
 }
 
 void AgentBasePrivate::delayedInit()
 {
   Q_Q( AgentBase );
   if ( !QDBusConnection::sessionBus().registerService( QLatin1String( "org.freedesktop.Akonadi.Agent." ) + mId ) )
     kFatal() << "Unable to register service at dbus:" << QDBusConnection::sessionBus().lastError().message();
   q->setOnline( mOnline );
 }
 
 void AgentBasePrivate::itemAdded( const Akonadi::Item &item, const Akonadi::Collection &collection )
 {
   if ( mObserver != 0 )
     mObserver->itemAdded( item, collection );
 }
 
 void AgentBasePrivate::itemChanged( const Akonadi::Item &item, const QSet<QByteArray> &partIdentifiers )
 {
   if ( mObserver != 0 )
     mObserver->itemChanged( item, partIdentifiers );
 }
 
 void AgentBasePrivate::itemMoved( const Akonadi::Item &item, const Akonadi::Collection &source, const Akonadi::Collection &dest )
 {
   AgentBase::ObserverV2 *observer2 = dynamic_cast<AgentBase::ObserverV2*>( mObserver );
   if ( mObserver ) {
     // inter-resource moves, requires we know which resources the source and destination are in though
     if ( !source.resource().isEmpty() && !dest.resource().isEmpty() ) {
       if ( source.resource() != dest.resource() ) {
         if ( source.resource() == q_ptr->identifier() ) { // moved away from us
           Akonadi::Item i( item );
           i.setParentCollection( source );
           mObserver->itemRemoved( i );
         }
         else if ( dest.resource() == q_ptr->identifier() ) // moved to us
           mObserver->itemAdded( item, dest );
         else if ( observer2 )
           observer2->itemMoved( item, source, dest );
         else
           // not for us, not sure if we should get here at all
           changeProcessed();
         return;
       }
     }
     // intra-resource move
     if ( observer2 ) {
       observer2->itemMoved( item, source, dest );
     } else {
       // ### we cannot just call itemRemoved here as this will already trigger changeProcessed()
       // so, just itemAdded() is good enough as no resource can have implemented intra-resource moves anyway
       // without using ObserverV2
       mObserver->itemAdded( item, dest );
       // mObserver->itemRemoved( item );
     }
   }
 }
 
 void AgentBasePrivate::itemRemoved( const Akonadi::Item &item )
 {
   if ( mObserver != 0 )
     mObserver->itemRemoved( item );
 }
 
 void AgentBasePrivate::itemLinked( const Akonadi::Item &item, const Akonadi::Collection &collection )
 {
   AgentBase::ObserverV2 *observer2 = dynamic_cast<AgentBase::ObserverV2*>( mObserver );
   if ( observer2 )
     observer2->itemLinked( item, collection );
   else
     changeProcessed();
 }
 
 void AgentBasePrivate::itemUnlinked( const Akonadi::Item &item, const Akonadi::Collection &collection )
 {
   AgentBase::ObserverV2 *observer2 = dynamic_cast<AgentBase::ObserverV2*>( mObserver );
   if ( observer2 )
     observer2->itemUnlinked( item, collection );
   else
     changeProcessed();
 }
 
 void AgentBasePrivate::collectionAdded( const Akonadi::Collection &collection, const Akonadi::Collection &parent )
 {
   if ( mObserver != 0 )
     mObserver->collectionAdded( collection, parent );
 }
 
 void AgentBasePrivate::collectionChanged( const Akonadi::Collection &collection )
 {
   AgentBase::ObserverV2 *observer2 = dynamic_cast<AgentBase::ObserverV2*>( mObserver );
   if ( mObserver != 0 && observer2 == 0 ) // For ObserverV2 we use the variant with the part identifiers
     mObserver->collectionChanged( collection );
 }
 
 void AgentBasePrivate::collectionChanged( const Akonadi::Collection &collection, const QSet<QByteArray> &partIdentifiers )
 {
   AgentBase::ObserverV2 *observer2 = dynamic_cast<AgentBase::ObserverV2*>( mObserver );
   if ( observer2 != 0 )
     observer2->collectionChanged( collection, partIdentifiers );
 }
 
 void AgentBasePrivate::collectionMoved( const Akonadi::Collection &collection, const Akonadi::Collection &source, const Akonadi::Collection &dest )
 {
   AgentBase::ObserverV2 *observer2 = dynamic_cast<AgentBase::ObserverV2*>( mObserver );
   if ( mObserver ) {
     // inter-resource moves, requires we know which resources the source and destination are in though
     if ( !source.resource().isEmpty() && !dest.resource().isEmpty() ) {
       if ( source.resource() != dest.resource() ) {
         if ( source.resource() == q_ptr->identifier() ) // moved away from us
           mObserver->collectionRemoved( collection );
         else if ( dest.resource() == q_ptr->identifier() ) // moved to us
           mObserver->collectionAdded( collection, dest );
         else if ( observer2 )
           observer2->collectionMoved( collection, source, dest );
         else // not for us, not sure if we should get here at all
           changeProcessed();
         return;
       }
     }
     // intra-resource move
     if ( observer2 ) {
       observer2->collectionMoved( collection, source, dest );
     } else {
       // ### we cannot just call collectionRemoved here as this will already trigger changeProcessed()
       // so, just collectionAdded() is good enough as no resource can have implemented intra-resource moves anyway
       // without using ObserverV2
       mObserver->collectionAdded( collection, dest );
     }
   }
 }
 
 void AgentBasePrivate::collectionRemoved( const Akonadi::Collection &collection )
 {
   if ( mObserver != 0 )
     mObserver->collectionRemoved( collection );
 }
 
 void AgentBasePrivate::changeProcessed()
 {
   mChangeRecorder->changeProcessed();
   QTimer::singleShot( 0, mChangeRecorder, SLOT( replayNext() ) );
 }
 
 void AgentBasePrivate::slotStatus( int status, const QString &message )
 {
   mStatusMessage = message;
   mStatusCode = 0;
 
   switch ( status ) {
     case AgentBase::Idle:
       if ( mStatusMessage.isEmpty() )
         mStatusMessage = defaultReadyMessage();
 
       mStatusCode = 0;
       break;
     case AgentBase::Running:
       if ( mStatusMessage.isEmpty() )
         mStatusMessage = defaultSyncingMessage();
 
       mStatusCode = 1;
       break;
     case AgentBase::Broken:
       if ( mStatusMessage.isEmpty() )
         mStatusMessage = defaultErrorMessage();
 
       mStatusCode = 2;
       break;
     default:
       Q_ASSERT( !"Unknown status passed" );
       break;
   }
 }
 
 void AgentBasePrivate::slotPercent( int progress )
 {
   mProgress = progress;
 }
 
 void AgentBasePrivate::slotWarning( const QString& message )
 {
   mTracer->warning( QString::fromLatin1( "AgentBase(%1)" ).arg( mId ), message );
 }
 
 void AgentBasePrivate::slotError( const QString& message )
 {
   mTracer->error( QString::fromLatin1( "AgentBase(%1)" ).arg( mId ), message );
 }
 
 void AgentBasePrivate::slotNetworkStatusChange( Solid::Networking::Status stat )
 {
   Q_Q( AgentBase );
   q->setOnline( stat == Solid::Networking::Connected );
 }
 
 
 AgentBase::AgentBase( const QString & id )
   : d_ptr( new AgentBasePrivate( this ) )
 {
   sAgentBase = this;
   d_ptr->mId = id;
   d_ptr->init();
 }
 
 AgentBase::AgentBase( AgentBasePrivate* d, const QString &id ) :
     d_ptr( d )
 {
   sAgentBase = this;
   d_ptr->mId = id;
   d_ptr->init();
 }
 
 AgentBase::~AgentBase()
 {
   delete d_ptr;
 }
 
 QString AgentBase::parseArguments( int argc, char **argv )
 {
   QString identifier;
   if ( argc < 3 ) {
     kDebug() << "Not enough arguments passed...";
     exit( 1 );
   }
 
   for ( int i = 1; i < argc - 1; ++i ) {
     if ( QLatin1String( argv[ i ] ) == QLatin1String( "--identifier" ) )
       identifier = QLatin1String( argv[ i + 1 ] );
   }
 
   if ( identifier.isEmpty() ) {
     kDebug() << "Identifier argument missing";
     exit( 1 );
   }
 
   QByteArray catalog;
   char *p = strrchr( argv[0], '/' );
   if ( p )
     catalog = QByteArray( p + 1 );
   else
     catalog = QByteArray( argv[0] );
 
   KCmdLineArgs::init( argc, argv, identifier.toLatin1(), catalog, ki18n( "Akonadi Agent" ), "0.1",
                       ki18n( "Akonadi Agent" ) );
 
   KCmdLineOptions options;
   options.add( "identifier <argument>", ki18n( "Agent identifier" ) );
   KCmdLineArgs::addCmdLineOptions( options );
 
   return identifier;
 }
 
 // @endcond
 
 int AgentBase::init( AgentBase *r )
 {
   QApplication::setQuitOnLastWindowClosed( false );
   KGlobal::locale()->insertCatalog( QLatin1String( "libakonadi" ) );
   int rv = kapp->exec();
   delete r;
   return rv;
 }
 
 int AgentBase::status() const
 {
   Q_D( const AgentBase );
 
   return d->mStatusCode;
 }
 
 QString AgentBase::statusMessage() const
 {
   Q_D( const AgentBase );
 
   return d->mStatusMessage;
 }
 
 int AgentBase::progress() const
 {
   Q_D( const AgentBase );
 
   return d->mProgress;
 }
 
 QString AgentBase::progressMessage() const
 {
   Q_D( const AgentBase );
 
   return d->mProgressMessage;
 }
 
 bool AgentBase::isOnline() const
 {
   Q_D( const AgentBase );
 
   return d->mOnline;
 }
 
 void AgentBase::setNeedsNetwork( bool needsNetwork )
 {
   Q_D( AgentBase );
-  /* d->mNeedsNetwork = needsNetwork; */
-  // We can't trust the above code, because there are a lot of broken NetworkManager
-  // installations around, which would cause the resource to be offline, even if there
-  // is an actual network connection available. Instead fake an online state.
-  d->mNeedsNetwork = false;
+  d->mNeedsNetwork = needsNetwork;
 
   if ( d->mNeedsNetwork ) {
     connect( Solid::Networking::notifier()
            , SIGNAL( statusChanged( Solid::Networking::Status ) )
            , this, SLOT( slotNetworkStatusChange( Solid::Networking::Status ) ) );
   } else {
     disconnect( Solid::Networking::notifier(), 0, 0, 0 );
     setOnline( true );
   }
 }
 
 void AgentBase::setOnline( bool state )
 {
   Q_D( AgentBase );
   d->mOnline = state;
   d->mSettings->setValue( QLatin1String( "Agent/Online" ), state );
   doSetOnline( state );
   emit onlineChanged( state );
 }
 
 void AgentBase::doSetOnline( bool online )
 {
   Q_UNUSED( online );
 }
 
 void AgentBase::configure( WId windowId )
 {
   Q_UNUSED( windowId );
   emit configurationDialogAccepted();
 }
 
 #ifdef Q_OS_WIN //krazy:exclude=cpp
 void AgentBase::configure( qlonglong windowId )
 {
   configure( reinterpret_cast<WId>( windowId ) );
 }
 #endif
 
 WId AgentBase::winIdForDialogs() const
 {
   const bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered( QLatin1String( "org.freedesktop.akonaditray" ) );
   if ( !registered )
     return 0;
 
   QDBusInterface dbus( QLatin1String( "org.freedesktop.akonaditray" ), QLatin1String( "/Actions" ),
                        QLatin1String( "org.freedesktop.Akonadi.Tray" ) );
   const QDBusMessage reply = dbus.call( QLatin1String( "getWinId" ) );
 
   if ( reply.type() == QDBusMessage::ErrorMessage )
     return 0;
 
   const WId winid = (WId)reply.arguments().at( 0 ).toLongLong();
 
   return winid;
 }
 
 void AgentBase::quit()
 {
   Q_D( AgentBase );
   aboutToQuit();
 
   if ( d->mSettings ) {
     d->mChangeRecorder->setConfig( 0 );
     d->mSettings->sync();
   }
 
   KGlobal::deref();
 }
 
 void AgentBase::aboutToQuit()
 {
 }
 
 void AgentBase::cleanup()
 {
   Q_D( AgentBase );
   // prevent the monitor from picking up deletion signals for our own data if we are a resource
   // and thus avoid that we kill our own data as last act before our own death
   d->mChangeRecorder->blockSignals( true );
 
   aboutToQuit();
 
   const QString fileName = d->mSettings->fileName();
 
   /*
    * First destroy the settings object...
    */
   d->mChangeRecorder->setConfig( 0 );
   delete d->mSettings;
   d->mSettings = 0;
 
   /*
    * ... then remove the file from hd.
    */
   QFile::remove( fileName );
 
   /*
    * ... and remove the changes file from hd.
    */
   QFile::remove( fileName + QLatin1String( "_changes.dat" ) );
 
   /*
    * ... and also remove the agent configuration file if there is one.
    */
   QString configFile = KStandardDirs::locateLocal( "config", KGlobal::config()->name() );
   QFile::remove( configFile );
 
   KGlobal::deref();
 }
 
 void AgentBase::registerObserver( Observer *observer )
 {
   d_ptr->mObserver = observer;
 }
 
 QString AgentBase::identifier() const
 {
   return d_ptr->mId;
 }
 
 void AgentBase::setAgentName( const QString &name )
 {
   Q_D( AgentBase );
   if ( name == d->mName )
     return;
 
   // TODO: rename collection
   d->mName = name;
 
   if ( d->mName.isEmpty() || d->mName == d->mId ) {
     d->mSettings->remove( QLatin1String( "Resource/Name" ) );
     d->mSettings->remove( QLatin1String( "Agent/Name" ) );
   } else
     d->mSettings->setValue( QLatin1String( "Agent/Name" ), d->mName );
 
   d->mSettings->sync();
 
   emit agentNameChanged( d->mName );
 }
 
 QString AgentBase::agentName() const
 {
   Q_D( const AgentBase );
   if ( d->mName.isEmpty() )
     return d->mId;
   else
     return d->mName;
 }
 
 void AgentBase::changeProcessed()
 {
   Q_D( AgentBase );
   d->changeProcessed();
 }
 
 ChangeRecorder * AgentBase::changeRecorder() const
 {
   return d_ptr->mChangeRecorder;
 }
 
 void AgentBase::abort()
 {
   emit abortRequested();
 }
 
 void AgentBase::reconfigure()
 {
   emit reloadConfiguration();
 }
 
 #include "agentbase.moc"
 #include "agentbase_p.moc"