From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 29 Jun 2010 22:41:16 +0000 (+0000)
Subject: Merged revisions 273054 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6ed608edb352a8cb6d67f86b8b7a818e23fae44;p=thirdparty%2Fasterisk.git

Merged revisions 273054 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r273054 | tilghman | 2010-06-29 17:39:22 -0500 (Tue, 29 Jun 2010) | 11 lines

  Send DialPlanComplete as a response, not as a separate event.

  Otherwise, it goes to all manager sessions and may exclude the current session,
  if the Events mask excludes it.

  (closes issue #17504)
   Reported by: rrb3942
   Patches:
         showdialplan_patch.diff uploaded by rrb3942 (license 1003)
   Tested by: rrb3942
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 7d475f1894..84d168d9a8 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6142,7 +6142,7 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m)
 		return 0;
 	}
 
-	manager_event(EVENT_FLAG_CONFIG, "ShowDialPlanComplete",
+	astman_append(s, "Event: ShowDialPlanComplete\r\n"
 		"EventList: Complete\r\n"
 		"ListItems: %d\r\n"
 		"ListExtensions: %d\r\n"