[asterisk-commits] jpeeler: branch 1.6.0 r232583 - in /branches/1.6.0: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Dec  2 16:03:50 2009
New Revision: 232583

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=232583
Log:
Merged revisions 232582 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r232582 | jpeeler | 2009-12-02 16:02:43 -0600 (Wed, 02 Dec 2009) | 14 lines
  
  Merged revisions 232581 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r232581 | jpeeler | 2009-12-02 15:57:42 -0600 (Wed, 02 Dec 2009) | 7 lines
    
    Send ack (response/message) after receiving manager action userevent
    
    (closes issue #16264)
    Reported by: dimas
    Patches: 
          event-ack.patch uploaded by dimas (license 88)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/manager.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=232583&r1=232582&r2=232583
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Wed Dec  2 16:03:50 2009
@@ -2474,6 +2474,7 @@
 		}
 	}
 
+	astman_send_ack(s, m, "Event Sent");	
 	manager_event(EVENT_FLAG_USER, "UserEvent", "UserEvent: %s\r\n%s", event, body->str);
 	return 0;
 }