sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s3: Lift the server_messaging_context from notify_job_status_byname

Browse Source
This commit is contained in:
Volker Lendecke 2010-08-08 16:21:42 +02:00
parent 21811fe72d
commit 9b3a53a7a7
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/include/proto.h
View File

@ -4416,7 +4416,10 @@ void notify_printer_status_byname(struct tevent_context *ev,
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,
void notify_job_status_byname(struct tevent_context *ev,
struct messaging_context *msg_ctx,
const char *sharename, uint32 jobid,
uint32 status,
uint32 flags);
void notify_job_status(const char *sharename, uint32 jobid, uint32 status);
void notify_job_total_bytes(const char *sharename, uint32 jobid,

12
source3/printing/notify.c
View File

@ -427,13 +427,15 @@ void notify_printer_status(struct tevent_context *ev,
notify_printer_status_byname(ev, msg_ctx, sharename, status);
}
void notify_job_status_byname(const char *sharename, uint32 jobid, uint32 status,
void notify_job_status_byname(struct tevent_context *ev,
struct messaging_context *msg_ctx,
const char *sharename, uint32 jobid,
uint32 status,
uint32 flags)
{
/* 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_STATUS, jobid,
status, 0, flags);
@ -441,7 +443,9 @@ void notify_job_status_byname(const char *sharename, uint32 jobid, uint32 status
void notify_job_status(const char *sharename, uint32 jobid, uint32 status)
{
notify_job_status_byname(sharename, jobid, status, 0);
notify_job_status_byname(server_event_context(),
server_messaging_context(),
sharename, jobid, status, 0);
}
void notify_job_total_bytes(const char *sharename, uint32 jobid,

4
source3/utils/smbcontrol.c
View File

@ -625,6 +625,7 @@ static bool do_printnotify(struct messaging_context *msg_ctx,
jobid = atoi(argv[3]);
notify_job_status_byname(
messaging_event_context(msg_ctx), msg_ctx,
argv[2], jobid, JOB_STATUS_PAUSED,
SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
@ -642,6 +643,7 @@ static bool do_printnotify(struct messaging_context *msg_ctx,
jobid = atoi(argv[3]);
notify_job_status_byname(
messaging_event_context(msg_ctx), msg_ctx,
argv[2], jobid, JOB_STATUS_QUEUED,
SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
@ -659,10 +661,12 @@ static bool do_printnotify(struct messaging_context *msg_ctx,
jobid = atoi(argv[3]);
notify_job_status_byname(
messaging_event_context(msg_ctx), msg_ctx,
argv[2], jobid, JOB_STATUS_DELETING,
SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
notify_job_status_byname(
messaging_event_context(msg_ctx), msg_ctx,
argv[2], jobid, JOB_STATUS_DELETING|
JOB_STATUS_DELETED,
SPOOLSS_NOTIFY_MSG_UNIX_JOBID);