Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
613da523
Commit
613da523
authored
Jul 15, 2010
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#3649] Use ~/.config as a file path for configuration file
parent
74016d29
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-common/sequenceParser.yml
+0
-157
0 additions, 157 deletions
sflphone-common/sequenceParser.yml
sflphone-common/src/managerimpl.cpp
+2
-3
2 additions, 3 deletions
sflphone-common/src/managerimpl.cpp
with
2 additions
and
160 deletions
sflphone-common/sequenceParser.yml
deleted
100755 → 0
+
0
−
157
View file @
74016d29
---
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
This diff is collapsed.
Click to expand it.
sflphone-common/src/managerimpl.cpp
+
2
−
3
View file @
613da523
...
@@ -2038,9 +2038,7 @@ int ManagerImpl::createSettingsPath (void) {
...
@@ -2038,9 +2038,7 @@ int ManagerImpl::createSettingsPath (void) {
}
}
// Load user's configuration
// Load user's configuration
_path
=
_path
+
DIR_SEPARATOR_STR
+
PROGNAME
+
"rc"
;
_path
=
_path
+
DIR_SEPARATOR_STR
+
PROGNAME
+
".yml"
;
_path
=
"configurationexample.yml"
;
return
1
;
return
1
;
}
}
...
@@ -2269,6 +2267,7 @@ void ManagerImpl::initConfigFile (bool load_user_value, std::string alternate) {
...
@@ -2269,6 +2267,7 @@ void ManagerImpl::initConfigFile (bool load_user_value, std::string alternate) {
file
.
open
(
path
.
data
(),
std
::
fstream
::
in
);
file
.
open
(
path
.
data
(),
std
::
fstream
::
in
);
if
(
!
file
.
is_open
())
{
if
(
!
file
.
is_open
())
{
_debug
(
"Manager: File %s not opened, create new one"
,
path
.
c_str
());
_debug
(
"Manager: File %s not opened, create new one"
,
path
.
c_str
());
file
.
open
(
path
.
data
(),
std
::
fstream
::
out
);
file
.
open
(
path
.
data
(),
std
::
fstream
::
out
);
out
=
true
;
out
=
true
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment