Rename mobile.conf to chan_mobile.conf, make module support old name, too
authorRussell Bryant <russell@russellbryant.com>
Tue, 30 Jun 2009 17:16:56 +0000 (17:16 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 30 Jun 2009 17:16:56 +0000 (17:16 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204423 65c4cc65-6c06-0410-ace0-fbb531ad65f3

addons/chan_mobile.c
configs/chan_mobile.conf.sample [moved from configs/mobile.conf.sample with 99% similarity]

index 415ca61..95aed48 100644 (file)
@@ -64,7 +64,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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 @@ static int mbl_load_config(void)
        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;
 
similarity index 99%
rename from configs/mobile.conf.sample
rename to configs/chan_mobile.conf.sample
index 7555a17..a96d2ab 100644 (file)
@@ -1,5 +1,5 @@
 ;
-; mobile.conf
+; chan_mobile.conf
 ; configuration file for chan_mobile
 ;