summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 16:26:40 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:35 +0200
commitbd6626c40ce9806a6f5bc8aee4fe969028bda928 (patch)
treed6969fbac3ae26fa3ebc5ab35f9f920247ff4583
parentedbed43119212c3642951516a1e6c065bd9db756 (diff)
downloadsamba-bd6626c40ce9806a6f5bc8aee4fe969028bda928.tar.gz
samba-bd6626c40ce9806a6f5bc8aee4fe969028bda928.tar.bz2
samba-bd6626c40ce9806a6f5bc8aee4fe969028bda928.zip
s3: Lift the server_messaging_context from notify_job_total_bytes
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/printing/notify.c7
-rw-r--r--source3/printing/printing.c4
3 files changed, 10 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e2fcdceef3..ff842af90d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4424,7 +4424,9 @@ void notify_job_status_byname(struct tevent_context *ev,
void notify_job_status(struct tevent_context *ev,
struct messaging_context *msg_ctx,
const char *sharename, uint32 jobid, uint32 status);
-void notify_job_total_bytes(const char *sharename, uint32 jobid,
+void notify_job_total_bytes(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ const char *sharename, uint32 jobid,
uint32 size);
void notify_job_total_pages(const char *sharename, uint32 jobid,
uint32 pages);
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 4b87a1980d..c8cdc4ec78 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -448,13 +448,14 @@ void notify_job_status(struct tevent_context *ev,
notify_job_status_byname(ev, msg_ctx, sharename, jobid, status, 0);
}
-void notify_job_total_bytes(const char *sharename, uint32 jobid,
+void notify_job_total_bytes(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ const char *sharename, uint32 jobid,
uint32 size)
{
/* Job id stored in id field, status in value1 */
- send_notify_field_values(server_event_context(),
- server_messaging_context(),
+ send_notify_field_values(ev, msg_ctx,
sharename, JOB_NOTIFY_TYPE,
JOB_NOTIFY_FIELD_TOTAL_BYTES, jobid,
size, 0, 0);
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index a305e86bea..b35c868469 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -596,7 +596,9 @@ static void pjob_store_notify(const char* sharename, uint32 jobid, struct printj
map_to_spoolss_status(new_data->status));
if (new_job || old_data->size != new_data->size)
- notify_job_total_bytes(sharename, jobid, new_data->size);
+ notify_job_total_bytes(server_event_context(),
+ server_messaging_context(),
+ sharename, jobid, new_data->size);
if (new_job || old_data->page_count != new_data->page_count)
notify_job_total_pages(sharename, jobid, new_data->page_count);