Index: apps/app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.78
diff -u -r1.78 app_queue.c
--- apps/app_queue.c	24 Jul 2004 03:37:50 -0000	1.78
+++ apps/app_queue.c	25 Jul 2004 22:11:41 -0000
@@ -217,6 +217,7 @@
 	int rrpos;			/* Round Robin - position */
 	int wrapped;			/* Round Robin - wrapped around? */
 	int joinempty;			/* Do we care if the queue has no members? */
+	int eventwhencalled;			/* Generate an event when the agent is called (before pickup) */
 
 	struct member *members;		/* Member channels to be tried */
 	struct queue_ent *head;		/* Start of the actual queue */
@@ -585,9 +586,22 @@
 		tmp->chan = NULL;
 		tmp->stillgoing = 0;
 		return 0;
-	} else
+	} else {
+		if (qe->parent->eventwhencalled) {
+			manager_event(EVENT_FLAG_AGENT, "AgentCalled",
+						"AgentCalled: %s/%s\r\n"
+						"ChannelCalling: %s\r\n"
+						"CallerID: %s\r\n"
+						"Context: %s\r\n"
+						"Extension: %s\r\n"
+						"Priority: %d\r\n",
+						tmp->tech, tmp->numsubst, qe->chan->name,
+						tmp->chan->callerid ? tmp->chan->callerid : "unknown <>",
+						qe->chan->context, qe->chan->exten, qe->chan->priority);
+		}
 		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", tmp->numsubst);
+			ast_verbose(VERBOSE_PREFIX_3 "Called %s/%s\n", tmp->tech, tmp->numsubst);
+	}
 	return 0;
 }
 
@@ -1833,6 +1845,8 @@
 						}
 					} else if (!strcasecmp(var->name, "joinempty")) {
 						q->joinempty = ast_true(var->value);
+					} else if (!strcasecmp(var->name, "eventwhencalled")) {
+						q->eventwhencalled = ast_true(var->value);
 					} else {
 						ast_log(LOG_WARNING, "Unknown keyword in queue '%s': %s at line %d of queue.conf\n", cat, var->name, var->lineno);
 					}
Index: configs/queues.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/queues.conf.sample,v
retrieving revision 1.12
diff -u -r1.12 queues.conf.sample
--- configs/queues.conf.sample	24 Jul 2004 03:37:50 -0000	1.12
+++ configs/queues.conf.sample	25 Jul 2004 22:11:41 -0000
@@ -111,6 +111,11 @@
 ;
 ; joinempty = yes
 ;
+; Asterisk can generate AgentCalled events when an agent is rung, if this is turned on
+; (may generate a LOT of extra manager events)
+;
+; eventwhencalled = yes
+;
 ; Each member of this call queue is listed on a separate line in
 ; the form technology/dialstring.  "member" means a normal member of a
 ; queue.  An optional penalty may be specified after a comma, such that