Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
da36bcaa
Commit
da36bcaa
authored
Oct 06, 2009
by
Alexandre Savard
Browse files
[#2006] Add init is_rec variable in ManagerImpl
parent
f5d7b28c
Changes
2
Hide whitespace changes
Inline
Side-by-side
sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
View file @
da36bcaa
...
...
@@ -57,7 +57,7 @@ void AudioZrtpSession::initializeZid (void)
_debug
(
" xdg_config %s
\n
"
,
xdg_config
.
c_str
());
if
(
XDG_CACHE_HOME
!=
NULL
)
{
std
::
string
xdg_env
=
std
::
string
(
XDG_CACHE_HOME
);
std
::
string
xdg_env
=
std
::
string
(
XDG_CACHE_HOME
)
+
_zidFilename
;
_debug
(
" xdg_env %s
\n
"
,
xdg_env
.
c_str
());
(
xdg_env
.
length
()
>
0
)
?
zidCompleteFilename
=
xdg_env
:
zidCompleteFilename
=
xdg_config
;
}
else
...
...
sflphone-common/src/managerimpl.cpp
View file @
da36bcaa
...
...
@@ -613,6 +613,7 @@ ManagerImpl::offHoldCall (const CallID& call_id)
bool
returnValue
,
is_rec
;
std
::
string
codecName
;
is_rec
=
false
;
_debug
(
"ManagerImpl::offHoldCall(%s)
\n
"
,
call_id
.
c_str
());
...
...
@@ -2194,8 +2195,6 @@ ManagerImpl::createSettingsPath (void)
xdg_config
=
std
::
string
(
HOMEDIR
)
+
DIR_SEPARATOR_STR
+
".config"
+
DIR_SEPARATOR_STR
+
PROGDIR
;
//_path = std::string (HOMEDIR) + DIR_SEPARATOR_STR + "." + PROGDIR;
if
(
XDG_CONFIG_HOME
!=
NULL
)
{
xdg_env
=
std
::
string
(
XDG_CONFIG_HOME
);
(
xdg_env
.
length
()
>
0
)
?
_path
=
xdg_env
...
...
@@ -2507,6 +2506,7 @@ ManagerImpl::getCurrentCodecName (const CallID& id)
VoIPLink
*
link
=
getAccountLink
(
accountid
);
Call
*
call
=
link
->
getCall
(
id
);
if
(
call
->
getState
()
!=
Call
::
Active
)
return
""
;
else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment