[asterisk-commits] twilson: branch twilson/calendaring r185669 - in /team/twilson/calendaring: i...

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Mar 31 18:11:08 2009
New Revision: 185669

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=185669
Log:
Make calendaring work with new the new exports stuff.

Modified:
    team/twilson/calendaring/include/asterisk/calendar.h
    team/twilson/calendaring/main/asterisk.exports
    team/twilson/calendaring/main/calendar.c

Modified: team/twilson/calendaring/include/asterisk/calendar.h
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/include/asterisk/calendar.h?view=diff&rev=185669&r1=185668&r2=185669
==============================================================================
--- team/twilson/calendaring/include/asterisk/calendar.h (original)
+++ team/twilson/calendaring/include/asterisk/calendar.h Tue Mar 31 18:11:08 2009
@@ -60,7 +60,7 @@
  * to unregister that module's calendar type (usually done in module_unload())
  */
 
-struct ast_config *calendar_config;
+extern struct ast_config *calendar_config;
 
 struct ast_calendar;
 struct ast_calendar_event;

Modified: team/twilson/calendaring/main/asterisk.exports
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/asterisk.exports?view=diff&rev=185669&r1=185668&r2=185669
==============================================================================
--- team/twilson/calendaring/main/asterisk.exports (original)
+++ team/twilson/calendaring/main/asterisk.exports Tue Mar 31 18:11:08 2009
@@ -28,6 +28,7 @@
 		devstate2str;
 		__manager_event;
 		dialed_interface_info;
+		calendar_config;
 	local:
 		*;
 };

Modified: team/twilson/calendaring/main/calendar.c
URL: http://svn.digium.com/svn-view/asterisk/team/twilson/calendaring/main/calendar.c?view=diff&rev=185669&r1=185668&r2=185669
==============================================================================
--- team/twilson/calendaring/main/calendar.c (original)
+++ team/twilson/calendaring/main/calendar.c Tue Mar 31 18:11:08 2009
@@ -847,12 +847,12 @@
 	while ((cat = ast_category_browse(calendar_config, cat))) {
 		if (!strcasecmp(cat, "general")) {
 			if (!(val = ast_variable_retrieve(calendar_config, cat, "enabled")) || !ast_true(val)) {
-				ast_debug(1, "Disabling calendar support\n");
+				ast_log(LOG_NOTICE, "Disabling calendar support\n");
 				ast_config_destroy(calendar_config);
 				calendar_config = NULL;
 				return -1;
 			} else {
-				ast_debug(1, "Enabling calendar support\n");
+				ast_log(LOG_NOTICE, "Enabling calendar support\n");
 			}
 		}
 	}