summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 16:31:41 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 18:09:35 +0200
commitaa5fd419b27b7c52eccc6c129b17d606e4635b3e (patch)
treebe7919fee3b3f5b0108d3f67d2f797528c3c8501
parent06cf2ae6ea3c8ef5e092dc3b465461746f3d466b (diff)
downloadsamba-aa5fd419b27b7c52eccc6c129b17d606e4635b3e.tar.gz
samba-aa5fd419b27b7c52eccc6c129b17d606e4635b3e.tar.bz2
samba-aa5fd419b27b7c52eccc6c129b17d606e4635b3e.zip
s3: Lift the server_messaging_context from notify_job_name
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/printing/notify.c6
-rw-r--r--source3/printing/printing.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2f6e81539d..e1784ebdac 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4435,7 +4435,9 @@ void notify_job_total_pages(struct tevent_context *ev,
void notify_job_username(struct tevent_context *ev,
struct messaging_context *msg_ctx,
const char *sharename, uint32 jobid, char *name);
-void notify_job_name(const char *sharename, uint32 jobid, char *name);
+void notify_job_name(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ const char *sharename, uint32 jobid, char *name);
void notify_job_submitted(const char *sharename, uint32 jobid,
time_t submitted);
void notify_printer_driver(int snum, const char *driver_name);
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index de073f42ec..97d59c5318 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -484,10 +484,12 @@ void notify_job_username(struct tevent_context *ev,
jobid, strlen(name) + 1, name);
}
-void notify_job_name(const char *sharename, uint32 jobid, char *name)
+void notify_job_name(struct tevent_context *ev,
+ struct messaging_context *msg_ctx,
+ const char *sharename, uint32 jobid, char *name)
{
send_notify_field_buffer(
- server_event_context(), server_messaging_context(),
+ ev, msg_ctx,
sharename, JOB_NOTIFY_TYPE, JOB_NOTIFY_FIELD_DOCUMENT,
jobid, strlen(name) + 1, name);
}
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index fe42f55d1e..093d3b7416 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -583,13 +583,17 @@ static void pjob_store_notify(const char* sharename, uint32 jobid, struct printj
}
if (new_job || !strequal(old_data->jobname, new_data->jobname))
- notify_job_name(sharename, jobid, new_data->jobname);
+ notify_job_name(server_event_context(),
+ server_messaging_context(),
+ sharename, jobid, new_data->jobname);
/* Job attributes of a new job or attributes that can be
modified. */
if (new_job || !strequal(old_data->jobname, new_data->jobname))
- notify_job_name(sharename, jobid, new_data->jobname);
+ notify_job_name(server_event_context(),
+ server_messaging_context(),
+ sharename, jobid, new_data->jobname);
if (new_job || old_data->status != new_data->status)
notify_job_status(server_event_context(),