diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 16:19:03 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 18:09:35 +0200 |
| commit | 21811fe72df202413ca7f65bf271d4c9fe1345c5 (patch) | |
| tree | 3f0f7fd6eff4d05564a772c5965006104d422f2b | |
| parent | 49d18478fd952b360221852a0bc0e2f4f6427aea (diff) | |
| download | samba-21811fe72df202413ca7f65bf271d4c9fe1345c5.tar.gz samba-21811fe72df202413ca7f65bf271d4c9fe1345c5.tar.bz2 samba-21811fe72df202413ca7f65bf271d4c9fe1345c5.zip | |
s3: Lift the server_messaging_context from notify_printer_status
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/printing/notify.c | 8 | ||||
| -rw-r--r-- | source3/printing/printing.c | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 7c2740aa4a..2b26b10deb 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4413,7 +4413,9 @@ void print_notify_send_messages(struct messaging_context *msg_ctx, void notify_printer_status_byname(struct tevent_context *ev, struct messaging_context *msg_ctx, const char *sharename, uint32 status); -void notify_printer_status(int snum, uint32 status); +void notify_printer_status(struct tevent_context *ev, + struct messaging_context *msg_ctx, + int snum, uint32 status); void notify_job_status_byname(const char *sharename, uint32 jobid, uint32 status, uint32 flags); void notify_job_status(const char *sharename, uint32 jobid, uint32 status); diff --git a/source3/printing/notify.c b/source3/printing/notify.c index 65151e9b05..de6515aa5c 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -417,14 +417,14 @@ void notify_printer_status_byname(struct tevent_context *ev, status, 0, 0); } -void notify_printer_status(int snum, uint32 status) +void notify_printer_status(struct tevent_context *ev, + struct messaging_context *msg_ctx, + int snum, uint32 status) { const char *sharename = lp_servicename(snum); if (sharename) - notify_printer_status_byname(server_event_context(), - server_messaging_context(), - sharename, status); + notify_printer_status_byname(ev, msg_ctx, sharename, status); } void notify_job_status_byname(const char *sharename, uint32 jobid, uint32 status, diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 8a12814386..5d8348e705 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -3063,7 +3063,8 @@ WERROR print_queue_pause(struct auth_serversupplied_info *server_info, /* Send a printer notify message */ - notify_printer_status(snum, PRINTER_STATUS_PAUSED); + notify_printer_status(server_event_context(), msg_ctx, snum, + PRINTER_STATUS_PAUSED); return WERR_OK; } @@ -3099,7 +3100,8 @@ WERROR print_queue_resume(struct auth_serversupplied_info *server_info, /* Send a printer notify message */ - notify_printer_status(snum, PRINTER_STATUS_OK); + notify_printer_status(server_event_context(), msg_ctx, snum, + PRINTER_STATUS_OK); return WERR_OK; } |