[svn-commits] jrose: trunk r416850 - in /trunk: ./ res/parking/parking_manager.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Fri Jun 20 15:57:46 2014
New Revision: 416850

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416850
Log:
res_parking: Make manager commands register with module information

Previously module information was not included due to an oversight.

Review: https://reviewboard.asterisk.org/r/3626/
........

Merged revisions 416849 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/parking/parking_manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/parking/parking_manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/parking/parking_manager.c?view=diff&rev=416850&r1=416849&r2=416850
==============================================================================
--- trunk/res/parking/parking_manager.c (original)
+++ trunk/res/parking/parking_manager.c Fri Jun 20 15:57:46 2014
@@ -37,6 +37,7 @@
 #include "asterisk/features.h"
 #include "asterisk/manager.h"
 #include "asterisk/bridge.h"
+#include "asterisk/module.h"
 
 /*** DOCUMENTATION
 	<manager name="Parkinglots" language="en_US">
@@ -665,10 +666,11 @@
 int load_parking_manager(void)
 {
 	int res;
-
-	res = ast_manager_register_xml_core("Parkinglots", EVENT_FLAG_CALL, manager_parking_lot_list);
-	res |= ast_manager_register_xml_core("ParkedCalls", EVENT_FLAG_CALL, manager_parking_status);
-	res |= ast_manager_register_xml_core("Park", EVENT_FLAG_CALL, manager_park);
+	const struct ast_module_info *module = parking_get_module_info();
+
+	res = ast_manager_register2("Parkinglots", EVENT_FLAG_CALL, manager_parking_lot_list, module->self, NULL, NULL);
+	res |= ast_manager_register2("ParkedCalls", EVENT_FLAG_CALL, manager_parking_status, module->self, NULL, NULL);
+	res |= ast_manager_register2("Park", EVENT_FLAG_CALL, manager_park, module->self, NULL, NULL);
 	parking_manager_enable_stasis();
 	return res ? -1 : 0;
 }