diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 16:01:51 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 18:09:34 +0200 |
| commit | 6720c6e071058a4b1dd0406d40fe6f30632044dc (patch) | |
| tree | 60e8ab0f5e51112432dbfe4d70bfe89ff81042bb | |
| parent | fc6e7bdc9e752b7b5ee4b978a605dde5b7c075e4 (diff) | |
| download | samba-6720c6e071058a4b1dd0406d40fe6f30632044dc.tar.gz samba-6720c6e071058a4b1dd0406d40fe6f30632044dc.tar.bz2 samba-6720c6e071058a4b1dd0406d40fe6f30632044dc.zip | |
s3: Lift the server_messaging_context from send_spoolss_notify2_msg
| -rw-r--r-- | source3/printing/notify.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/source3/printing/notify.c b/source3/printing/notify.c index 1a499b2ca8..44fa50157d 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -267,7 +267,9 @@ static bool copy_notify2_msg( SPOOLSS_NOTIFY_MSG *to, SPOOLSS_NOTIFY_MSG *from ) Batch up print notify messages. *******************************************************************/ -static void send_spoolss_notify2_msg(SPOOLSS_NOTIFY_MSG *msg) +static void send_spoolss_notify2_msg(struct tevent_context *ev, + struct messaging_context *msg_ctx, + SPOOLSS_NOTIFY_MSG *msg) { struct notify_queue *pnqueue, *tmp_ptr; @@ -330,12 +332,11 @@ to notify_queue_head\n", msg->type, msg->field, msg->printer)); DLIST_ADD_END(notify_queue_head, pnqueue, struct notify_queue *); num_messages++; - if ((notify_event == NULL) && (server_event_context() != NULL)) { + if ((notify_event == NULL) && (ev != NULL)) { /* Add an event for 1 second's time to send this queue. */ - notify_event = tevent_add_timer(server_event_context(), NULL, - timeval_current_ofs(1,0), - print_notify_event_send_messages, - server_messaging_context()); + notify_event = tevent_add_timer( + ev, NULL, timeval_current_ofs(1,0), + print_notify_event_send_messages, msg_ctx); } } @@ -366,7 +367,8 @@ static void send_notify_field_values(const char *sharename, uint32 type, msg->notify.value[1] = value2; msg->flags = flags; - send_spoolss_notify2_msg(msg); + send_spoolss_notify2_msg(server_event_context(), + server_messaging_context(), msg); } static void send_notify_field_buffer(const char *sharename, uint32 type, @@ -394,7 +396,8 @@ static void send_notify_field_buffer(const char *sharename, uint32 type, msg->len = len; msg->notify.data = CONST_DISCARD(char *,buffer); - send_spoolss_notify2_msg(msg); + send_spoolss_notify2_msg(server_event_context(), + server_messaging_context(), msg); } /* Send a message that the printer status has changed */ |