Changeset View
Changeset View
Standalone View
Standalone View
src/widgets/selftestdialog.cpp
Show All 13 Lines | 1 | /* | |||
---|---|---|---|---|---|
14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License | ||
15 | along with this library; see the file COPYING.LIB. If not, write to the | 15 | along with this library; see the file COPYING.LIB. If not, write to the | ||
16 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | 16 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
17 | 02110-1301, USA. | 17 | 02110-1301, USA. | ||
18 | */ | 18 | */ | ||
19 | 19 | | |||
20 | #include "selftestdialog.h" | 20 | #include "selftestdialog.h" | ||
21 | #include "agentmanager.h" | 21 | #include "agentmanager.h" | ||
22 | #include "KDBusConnectionPool" | | |||
23 | #include "servermanager.h" | 22 | #include "servermanager.h" | ||
24 | #include "servermanager_p.h" | 23 | #include "servermanager_p.h" | ||
25 | #include "private/standarddirs_p.h" | 24 | #include "private/standarddirs_p.h" | ||
26 | #include "private/protocol_p.h" | 25 | #include "private/protocol_p.h" | ||
27 | 26 | | |||
28 | #include <QUrl> | 27 | #include <QUrl> | ||
29 | #include <QIcon> | 28 | #include <QIcon> | ||
30 | #include <QFileDialog> | 29 | #include <QFileDialog> | ||
▲ Show 20 Lines • Show All 379 Lines • ▼ Show 20 Line(s) | 408 | report(Error, ki18n("akonadictl found but not usable"), | |||
410 | ki18n("The program '%1' to control the Akonadi server was found " | 409 | ki18n("The program '%1' to control the Akonadi server was found " | ||
411 | "but could not be executed successfully.\nResult:\n%2\n" | 410 | "but could not be executed successfully.\nResult:\n%2\n" | ||
412 | "Make sure the Akonadi server is installed correctly.").subs(path).subs(result)); | 411 | "Make sure the Akonadi server is installed correctly.").subs(path).subs(result)); | ||
413 | } | 412 | } | ||
414 | } | 413 | } | ||
415 | 414 | | |||
416 | void SelfTestDialog::testServerStatus() | 415 | void SelfTestDialog::testServerStatus() | ||
417 | { | 416 | { | ||
418 | if (KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control))) { | 417 | if (QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Control))) { | ||
419 | report(Success, ki18n("Akonadi control process registered at D-Bus."), | 418 | report(Success, ki18n("Akonadi control process registered at D-Bus."), | ||
420 | ki18n("The Akonadi control process is registered at D-Bus which typically indicates it is operational.")); | 419 | ki18n("The Akonadi control process is registered at D-Bus which typically indicates it is operational.")); | ||
421 | } else { | 420 | } else { | ||
422 | report(Error, ki18n("Akonadi control process not registered at D-Bus."), | 421 | report(Error, ki18n("Akonadi control process not registered at D-Bus."), | ||
423 | ki18n("The Akonadi control process is not registered at D-Bus which typically means it was not started " | 422 | ki18n("The Akonadi control process is not registered at D-Bus which typically means it was not started " | ||
424 | "or encountered a fatal error during startup.")); | 423 | "or encountered a fatal error during startup.")); | ||
425 | } | 424 | } | ||
426 | 425 | | |||
427 | if (KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server))) { | 426 | if (QDBusConnection::sessionBus().interface()->isServiceRegistered(ServerManager::serviceName(ServerManager::Server))) { | ||
428 | report(Success, ki18n("Akonadi server process registered at D-Bus."), | 427 | report(Success, ki18n("Akonadi server process registered at D-Bus."), | ||
429 | ki18n("The Akonadi server process is registered at D-Bus which typically indicates it is operational.")); | 428 | ki18n("The Akonadi server process is registered at D-Bus which typically indicates it is operational.")); | ||
430 | } else { | 429 | } else { | ||
431 | report(Error, ki18n("Akonadi server process not registered at D-Bus."), | 430 | report(Error, ki18n("Akonadi server process not registered at D-Bus."), | ||
432 | ki18n("The Akonadi server process is not registered at D-Bus which typically means it was not started " | 431 | ki18n("The Akonadi server process is not registered at D-Bus which typically means it was not started " | ||
433 | "or encountered a fatal error during startup.")); | 432 | "or encountered a fatal error during startup.")); | ||
434 | } | 433 | } | ||
435 | } | 434 | } | ||
▲ Show 20 Lines • Show All 219 Lines • Show Last 20 Lines |