Bug 242: add job aborted message to failure notification

diff --git a/CHANGES b/CHANGES
index 5b60a730b8c7ebeba1640aa923410ae5133ca34a..b30d711123e415b03d4d5bdcf5c46c13222aa0eb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* add a job abort notification message (27 Sep 2005)
 * requeue batches together (27 Sep 2005)
 * add IXO/TAP page batching (27 Sep 2005)
 * fix Class 1 handling of EOM in pagehandling (27 Sep 2005)

diff --git a/faxd/faxQueueApp.c++ b/faxd/faxQueueApp.c++
index 7213cfebd21418b529b8d8159a61bb227e6fd510..1f41c3442c82b67722995b5601ee0a7ed5d15df3 100644 (file)
--- a/faxd/faxQueueApp.c++
+++ b/faxd/faxQueueApp.c++
@@ -1903,8 +1903,10 @@ faxQueueApp::terminateJob(const fxStr& jobid, JobStatus why)
        job->state = FaxRequest::state_failed;
        Trigger::post(Trigger::JOB_KILL, *job);
        FaxRequest* req = readRequest(*job);
-       if (req)
+       if (req) {
+           req->notice = "Job aborted by request";
            deleteRequest(*job, req, why, why != Job::removed);
+       }
        setDead(*job);
        return (true);
     } else