diff --git a/kaccess/CMakeLists.txt b/kaccess/CMakeLists.txt --- a/kaccess/CMakeLists.txt +++ b/kaccess/CMakeLists.txt @@ -30,5 +30,5 @@ ########### install files ############### -install( FILES kaccess.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) +install( FILES kaccess.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR} ) install( FILES kaccess.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} ) diff --git a/kaccess/kaccess.desktop b/kaccess/kaccess.desktop --- a/kaccess/kaccess.desktop +++ b/kaccess/kaccess.desktop @@ -92,6 +92,4 @@ Name[zh_TW]=KDE 無障礙工具 Exec=kaccess X-DBUS-StartupType=None -X-KDE-Library=kcm_access -X-KDE-ParentApp=kcontrol -X-DocPath=kcontrol/kcmaccess/index.html +X-KDE-autostart-phase=0 diff --git a/kcms/access/kcmaccess.cpp b/kcms/access/kcmaccess.cpp --- a/kcms/access/kcmaccess.cpp +++ b/kcms/access/kcmaccess.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -450,7 +449,7 @@ // make kaccess reread the configuration // turning a11y features off needs to be done by kaccess // so run it to clear any enabled features and it will exit if it should - KToolInvocation::startServiceByDesktopName(QStringLiteral("kaccess")); + QProcess::startDetached(QStringLiteral("kaccess")); emit changed(false); } @@ -553,16 +552,5 @@ ui.timeoutDelay->setEnabled(useTimeout); } -extern "C" -{ - /* This one gets called by kcminit - - */ - Q_DECL_EXPORT void kcminit_access() - { - KToolInvocation::startServiceByDesktopName(QStringLiteral("kaccess")); - } -} - #include "kcmaccess.moc" diff --git a/kcms/access/kcmaccess.desktop b/kcms/access/kcmaccess.desktop --- a/kcms/access/kcmaccess.desktop +++ b/kcms/access/kcmaccess.desktop @@ -2,14 +2,12 @@ Exec=kcmshell5 kcmaccess Icon=preferences-desktop-accessibility Type=Service -X-KDE-ServiceTypes=KCModule,KCModuleInit +X-KDE-ServiceTypes=KCModule X-DocPath=kcontrol/kcmaccess/index.html X-KDE-Library=kcm_access -X-KDE-Init-Symbol=kcminit_access X-KDE-ParentApp=kcontrol X-KDE-OnlyShowOnQtPlatforms=xcb; -X-KDE-Init-Phase=0 X-KDE-System-Settings-Parent-Category=personalization X-KDE-Weight=70