Use own copy of org.kde.JobView.xml

Use own copy of org.kde.JobView interface file to make it possible to
extend the interface without breaking build.

This also fixes 2 cases where error/errorText would be incorrect in
applicationsjob dataengine.

REVIEW: 123046

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})

dataengines/applicationjobs/jobaction.cpp

@@ -19,6 +19,7 @@
 #include "jobaction.h"
 #include "kuiserverengine.h"
 
+#include <kio/global.h>
 #include <klocalizedstring.h>
 #include <QDebug>
 
@@ -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."));
     }
 

kuiserver/CMakeLists.txt

@@ -22,7 +22,7 @@ ki18n_wrap_ui(kuiserver_KDEINIT_SRCS configdialog.ui)
 #<DBus Stuff>
 
 #<JobView>
-  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 )
 

kuiserver/org.kde.JobView.xml

@@ -0,0 +1,57 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.kde.JobViewV2">
+    <method name="terminate">
+      <arg name="errorMessage" type="s" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setSuspended">
+      <arg name="suspended" type="b" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setTotalAmount">
+      <arg name="amount" type="t" direction="in"/>
+      <arg name="unit" type="s" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setProcessedAmount">
+      <arg name="amount" type="t" direction="in"/>
+      <arg name="unit" type="s" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setPercent">
+      <arg name="percent" type="u" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setSpeed">
+      <arg name="bytesPerSecond" type="t" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setInfoMessage">
+      <arg name="message" type="s" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setDescriptionField">
+      <arg name="number" type="u" direction="in"/>
+      <arg name="name" type="s" direction="in"/>
+      <arg name="value" type="s" direction="in"/>
+      <arg name="res" type="b" direction="out"/>
+    </method>
+    <method name="clearDescriptionField">
+      <arg name="number" type="u" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setDestUrl">
+      <arg name="destUrl" type="v" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <method name="setError">
+      <arg name="errorCode" type="u" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+    <signal name="suspendRequested"/>
+    <signal name="resumeRequested"/>
+    <signal name="cancelRequested"/>
+  </interface>
+</node>

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());
         }
     }
 }