diff --git a/sflphone-common/sequenceParser.yml b/sflphone-common/sequenceParser.yml deleted file mode 100755 index 7bd7f793a5583b2db279be051fc714d2ea21eb97..0000000000000000000000000000000000000000 --- a/sflphone-common/sequenceParser.yml +++ /dev/null @@ -1,157 +0,0 @@ ---- -accounts: - - id: IP2IP - alias: - username: - password: - hostname: - enable: true - type: SIP - expire: 3600 - interface: default - port: 5060 - mailbox: - publishAddr: 0.0.0.0 - publishPort: 5060 - sameasLocal: true - resolveOnce: false - codecs: 0/9/110/111/112/ - stunServer: stun.sflphone.org - stunEnabled: false - displayName: Alexandre Savard - credential: - count: 0 - srtp: - enable: false - keyExchange: sdes - rtpFallback: false - zrtp: - displaySas: false - displaySasOnce: false - helloHashEnabled: false - notSuppWarning: false - tls: - tlsPort: 5061 - certificate: - calist: - ciphers: - enable: false - method: TLSv1 - timeout: 0 - password: - privateKey: - requireCertif: false - server: - verifyClient: false - verifyServer: false - - - id: Account:1278432417 - alias: sfl-181 - username: 181 - password: sfl-181pw - hostname: 192.168.50.3 - enable: true - type: SIP - expire: 3600 - interface: default - port: 5060 - mailbox: 97 - publishAddr: 192.168.50.182 - publishPort: 5060 - sameasLocal: true - resolveOnce: false - codecs: 0/9/110/111/112/ - stunServer: stun.sflphone.org - stunEnabled: false - displayName: Alexandre Savard - credential: - count: 0 - srtp: - enable: false - keyExchange: sdes - rtpFallback: false - zrtp: - displaySas: false - displaySasOnce: false - helloHashEnabled: false - notSuppWarning: false - tls: - tlsPort: 5061 - certificate: /home/msavard/Development/sflphone/sflphone-client-gnome/config.guess - calist: /home/msavard/Development/sflphone/sflphone-client-gnome/aclocal.m4 - ciphers: - enable: false - method: TLSv1 - timeout: 0 - password: - privateKey: /home/msavard/Development/sflphone/sflphone-client-gnome/config.log - requireCertif: true - server: - verifyClient: true - verifyServer: true - -addressbook: - photo: true - enabled: true - list: 1243608768.30329.0@emilou-desktop/1243456917.15690.23@emilou-desktop/ - maxResults: 25 - business: true - home: false - mobile: false - -audio: - alsa: - cardin: 0 - cardout: 0 - cardring: 0 - framesize: 20 - plugin: default - smplrate: 44100 - pulse: - devicePlayback: - deviceRecord: - deviceRingtone: - recordpath: /home/msavard/Bureau - ringchoice: /usr/share/sflphone/ringtones/konga.ul - volumemic: 100 - volumespkr: 100 - -hooks: - iax2Enabled: false - numberAddPrefix: false - numberEnabled: false - sipEnabled: false - urlCommand: x-www-browser - urlSipField: X-sflphone-url - -preferences: - order: Account:1278432417/ - audioApi: 0 - dialpadDisplay: 0 - historyEnabled: 1 - historyLimit: 30 - historyMaxCalls: 20 - notifyAll: true - notifyMails: false - zoneToneChoice: North America - registrationExpire: 180 - ringtoneEnabled: true - portNum: 5060 - searchBarDisplay: true - startHidden: 0 - volumeDisplay: 0 - windowHeight: 332 - windowPopup: 0 - windowPosition: 0 - windowWidth: 240 - zeroConfenable: false - md5Hash: false - -voipPreferences: - playDtmf: true - playTones: true - pulseLength: 250 - sendDtmfAs: 0 - symmetric: true - zidFile: sfl.zid -... \ No newline at end of file diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp index f657216217a5c7b471c688f6d1f7b297154fc174..9d7b31a2024b8ff0a953f4da5c3fa164c75899f4 100755 --- a/sflphone-common/src/managerimpl.cpp +++ b/sflphone-common/src/managerimpl.cpp @@ -2038,9 +2038,7 @@ int ManagerImpl::createSettingsPath (void) { } // Load user's configuration - _path = _path + DIR_SEPARATOR_STR + PROGNAME + "rc"; - - _path = "configurationexample.yml"; + _path = _path + DIR_SEPARATOR_STR + PROGNAME + ".yml"; return 1; } @@ -2269,6 +2267,7 @@ void ManagerImpl::initConfigFile (bool load_user_value, std::string alternate) { file.open (path.data(), std::fstream::in); if (!file.is_open()) { + _debug("Manager: File %s not opened, create new one", path.c_str()); file.open (path.data(), std::fstream::out); out = true;