diff --git a/dataengines/applicationjobs/CMakeLists.txt b/dataengines/applicationjobs/CMakeLists.txt index e25ff0c20..247dbadf0 100644 --- a/dataengines/applicationjobs/CMakeLists.txt +++ b/dataengines/applicationjobs/CMakeLists.txt @@ -6,7 +6,7 @@ set(kuiserver_engine_SRCS jobaction.cpp ) -qt5_add_dbus_adaptor(kuiserver_engine_SRCS ${KJOBWIDGETS_DBUS_INTERFACES_DIR}/kf5_org.kde.JobViewV2.xml kuiserverengine.h JobView jobviewadaptor ) +qt5_add_dbus_adaptor(kuiserver_engine_SRCS ${CMAKE_SOURCE_DIR}/kuiserver/org.kde.JobView.xml kuiserverengine.h JobView jobviewadaptor ) qt5_add_dbus_adaptor(kuiserver_engine_SRCS ${KJOBWIDGETS_DBUS_INTERFACES_DIR}/kf5_org.kde.JobViewServer.xml kuiserverengine.h KuiserverEngine jobviewserveradaptor ) add_library(plasma_engine_applicationjobs MODULE ${kuiserver_engine_SRCS}) diff --git a/dataengines/applicationjobs/jobaction.cpp b/dataengines/applicationjobs/jobaction.cpp index f06977e81..0de1359db 100644 --- a/dataengines/applicationjobs/jobaction.cpp +++ b/dataengines/applicationjobs/jobaction.cpp @@ -19,6 +19,7 @@ #include "jobaction.h" #include "kuiserverengine.h" +#include #include #include @@ -42,6 +43,7 @@ void JobAction::start() } else if (operationName() == "stop") { m_jobView->requestStateChange(JobView::Stopped); //in case the app crashed and won't call terminate on the jobview. + m_jobView->setError(KIO::ERR_USER_CANCELED); m_jobView->terminate(i18n("Job canceled by user.")); } diff --git a/kuiserver/CMakeLists.txt b/kuiserver/CMakeLists.txt index a4fc0490b..0f7c29ea4 100644 --- a/kuiserver/CMakeLists.txt +++ b/kuiserver/CMakeLists.txt @@ -22,7 +22,7 @@ ki18n_wrap_ui(kuiserver_KDEINIT_SRCS configdialog.ui) # # - set(jobview_xml ${KJOBWIDGETS_DBUS_INTERFACES_DIR}/kf5_org.kde.JobViewV2.xml) + set(jobview_xml org.kde.JobView.xml) qt5_add_dbus_adaptor(kuiserver_KDEINIT_SRCS ${jobview_xml} jobview.h JobView jobviewadaptor ) diff --git a/kuiserver/org.kde.JobView.xml b/kuiserver/org.kde.JobView.xml new file mode 100644 index 000000000..f9f72526f --- /dev/null +++ b/kuiserver/org.kde.JobView.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kuiserver/progresslistmodel.cpp b/kuiserver/progresslistmodel.cpp index 11fccac36..fe147f3db 100644 --- a/kuiserver/progresslistmodel.cpp +++ b/kuiserver/progresslistmodel.cpp @@ -324,7 +324,7 @@ void ProgressListModel::serviceUnregistered(const QString &name) if (!jobs.isEmpty()) { m_jobViewsOwners.remove(name); Q_FOREACH(JobView *job, jobs) { - job->terminate(QString()); + job->terminate(job->errorText()); } } }