@@ -34,6 +34,7 @@ #include <QDir> #include <QDebug> #include <QTimer> +#include <QPointer> #include <QtDBus/QDBusInterface> #include <QtDBus/QDBusReply> #include <QtDBus/QDBusConnection> @@ -58,7 +59,7 @@ public: Private(); QString convertPacmanConfToAqpmConf() const; - QTemporaryFile *tempfile; + QPointer<QTemporaryFile> tempfile; bool lastResult; QString chroot; @@ -249,6 +250,11 @@ void ConfigurationThread::saveConfigurationAsync() } } + if (!QDBusConnection::systemBus().interface()->isServiceRegistered("org.chakraproject.aqpmconfigurator")) { + qDebug() << "Requesting service start"; + QDBusConnection::systemBus().interface()->startService("org.chakraproject.aqpmconfigurator"); + } + QDBusConnection::systemBus().connect("org.chakraproject.aqpmconfigurator", "/Configurator", "org.chakraproject.aqpmconfigurator", "configuratorResult", this, SLOT(configuratorResult(bool))); @@ -262,7 +268,6 @@ void ConfigurationThread::saveConfigurationAsync() message << QString(d->tempfile->readAll()); message << QString(d->chroot + AQPM_CONFIGURATION_FILE); QDBusConnection::systemBus().call(message); - qDebug() << QDBusConnection::systemBus().lastError(); d->tempfile->close(); PERFORM_RETURN_VOID(Configuration::SaveConfigurationAsync) @@ -421,6 +426,11 @@ void ConfigurationThread::addMirrorToMirrorListAsync(const QString &mirror, Conf } } + if (!QDBusConnection::systemBus().interface()->isServiceRegistered("org.chakraproject.aqpmconfigurator")) { + qDebug() << "Requesting service start"; + QDBusConnection::systemBus().interface()->startService("org.chakraproject.aqpmconfigurator"); + } + QDBusConnection::systemBus().connect("org.chakraproject.aqpmconfigurator", "/Configurator", "org.chakraproject.aqpmconfigurator", "configuratorResult", this, SLOT(configuratorResult(bool))); libaqpm/ConfigurationThread.cpp 4f7fe205b52159e73bfc27aed852a0565c6ecb92 Dario Freddi drf@kde.org http://github.com/drf/aqpm/commit/66f85a60759c4ed02421e584b65e4c084989e7f2 66f85a60759c4ed02421e584b65e4c084989e7f2 2009-11-07T08:30:50-08:00 2009-11-07T08:30:50-08:00 Fix some stuff in configuration Signed-off-by: Dario Freddi <drf@kde.org> 01715103a689a0bf32a384b6ba47889a50bb287e Dario Freddi drf@kde.org