From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 16 Jan 2012 15:14:35 +0000 (+0100)
Subject: s3:smbcontrol: avoid using messaging_event_context()
X-Git-Tag: tevent-0.9.15~358
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecd8fcdb1eaf7ef4efa7d26dcef1fb4a8950fd8e;p=thirdparty%2Fsamba.git

s3:smbcontrol: avoid using messaging_event_context()

metze
---

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 2f5d860526b..5699f233048 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -658,8 +658,7 @@ static bool do_printnotify(struct tevent_context *ev_ctx,
 			return False;
 		}
 
-		notify_printer_status_byname(messaging_event_context(msg_ctx),
-					     msg_ctx, argv[2],
+		notify_printer_status_byname(ev_ctx, msg_ctx, argv[2],
 					     PRINTER_STATUS_PAUSED);
 
 		goto send;
@@ -672,8 +671,7 @@ static bool do_printnotify(struct tevent_context *ev_ctx,
 			return False;
 		}
 
-		notify_printer_status_byname(messaging_event_context(msg_ctx),
-					     msg_ctx, argv[2],
+		notify_printer_status_byname(ev_ctx, msg_ctx, argv[2],
 					     PRINTER_STATUS_OK);
 
 		goto send;
@@ -690,7 +688,7 @@ static bool do_printnotify(struct tevent_context *ev_ctx,
 		jobid = atoi(argv[3]);
 
 		notify_job_status_byname(
-			messaging_event_context(msg_ctx), msg_ctx,
+			ev_ctx, msg_ctx,
 			argv[2], jobid, JOB_STATUS_PAUSED,
 			SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
 
@@ -708,7 +706,7 @@ static bool do_printnotify(struct tevent_context *ev_ctx,
 		jobid = atoi(argv[3]);
 
 		notify_job_status_byname(
-			messaging_event_context(msg_ctx), msg_ctx,
+			ev_ctx, msg_ctx,
 			argv[2], jobid, JOB_STATUS_QUEUED, 
 			SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
 
@@ -726,12 +724,12 @@ static bool do_printnotify(struct tevent_context *ev_ctx,
 		jobid = atoi(argv[3]);
 
 		notify_job_status_byname(
-			messaging_event_context(msg_ctx), msg_ctx,
+			ev_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,
+			ev_ctx, msg_ctx,
 			argv[2], jobid, JOB_STATUS_DELETING|
 			JOB_STATUS_DELETED,
 			SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
@@ -760,8 +758,7 @@ static bool do_printnotify(struct tevent_context *ev_ctx,
 			return False;
 		}
 
-		notify_printer_byname(messaging_event_context(msg_ctx),
-				      msg_ctx, argv[2], attribute,
+		notify_printer_byname(ev_ctx, msg_ctx, argv[2], attribute,
 				      discard_const_p(char, argv[4]));
 
 		goto send;