[svn-commits] russell: trunk r204423 - in /trunk: addons/ configs/

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 30 12:16:56 2009
New Revision: 204423

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=204423
Log:
Rename mobile.conf to chan_mobile.conf, make module support old name, too

Added:
    trunk/configs/chan_mobile.conf.sample
      - copied, changed from r204421, trunk/configs/mobile.conf.sample
Removed:
    trunk/configs/mobile.conf.sample
Modified:
    trunk/addons/chan_mobile.c

Modified: trunk/addons/chan_mobile.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/addons/chan_mobile.c?view=diff&rev=204423&r1=204422&r2=204423
==============================================================================
--- trunk/addons/chan_mobile.c (original)
+++ trunk/addons/chan_mobile.c Tue Jun 30 12:16:56 2009
@@ -64,7 +64,8 @@
 #include "asterisk/manager.h"
 #include "asterisk/io.h"
 
-#define MBL_CONFIG "mobile.conf"
+#define MBL_CONFIG "chan_mobile.conf"
+#define MBL_CONFIG_OLD "mobile.conf"
 
 #define DEVICE_FRAME_SIZE 48
 #define DEVICE_FRAME_FORMAT AST_FORMAT_SLINEAR
@@ -4075,6 +4076,9 @@
 	struct ast_flags config_flags = { 0 };
 
 	cfg = ast_config_load(MBL_CONFIG, config_flags);
+	if (!cfg) {
+		cfg = ast_config_load(MBL_CONFIG_OLD, config_flags);
+	}
 	if (!cfg)
 		return -1;
 

Copied: trunk/configs/chan_mobile.conf.sample (from r204421, trunk/configs/mobile.conf.sample)
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/configs/chan_mobile.conf.sample?view=diff&rev=204423&p1=trunk/configs/mobile.conf.sample&r1=204421&p2=trunk/configs/chan_mobile.conf.sample&r2=204423
==============================================================================
--- trunk/configs/mobile.conf.sample (original)
+++ trunk/configs/chan_mobile.conf.sample Tue Jun 30 12:16:56 2009
@@ -1,5 +1,5 @@
 ;
-; mobile.conf
+; chan_mobile.conf
 ; configuration file for chan_mobile
 ;