summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 16:28:03 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:35 +0200
commit7a9f94dae87061b15245314cbe6d079f62f1db98 (patch)
treebbcf19dc7a7149cbc6193e345cf4e54c66d3cb1c
parentbd6626c40ce9806a6f5bc8aee4fe969028bda928 (diff)
downloadsamba-7a9f94dae87061b15245314cbe6d079f62f1db98.tar.gz
samba-7a9f94dae87061b15245314cbe6d079f62f1db98.tar.xz
samba-7a9f94dae87061b15245314cbe6d079f62f1db98.zip
s3: Lift the server_messaging_context from notify_job_total_pages
-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 ff842af90d..ca52984eb8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4428,7 +4428,9 @@ 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,
+void notify_job_total_pages(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ const char *sharename, uint32 jobid,
uint32 pages);
void notify_job_username(const char *sharename, uint32 jobid, char *name);
void notify_job_name(const char *sharename, uint32 jobid, char *name);
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index c8cdc4ec78..17dceaec3a 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -461,13 +461,14 @@ void notify_job_total_bytes(struct tevent_context *ev,
size, 0, 0);
}
-void notify_job_total_pages(const char *sharename, uint32 jobid,
+void notify_job_total_pages(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ const char *sharename, uint32 jobid,
uint32 pages)
{
/* 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_PAGES, jobid,
pages, 0, 0);
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index b35c868469..d84fc7699b 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -601,7 +601,9 @@ static void pjob_store_notify(const char* sharename, uint32 jobid, struct printj
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);
+ notify_job_total_pages(server_event_context(),
+ server_messaging_context(),
+ sharename, jobid, new_data->page_count);
}
/****************************************************************************