Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-daemon
Commits
201847af
Commit
201847af
authored
Sep 21, 2011
by
Emmanuel Lepage
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Alternative can now be selected from the call view context menu
parent
ec858ede
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
kde/src/SFLPhoneView.cpp
kde/src/SFLPhoneView.cpp
+2
-1
kde/src/conf/dlgaccounts.cpp
kde/src/conf/dlgaccounts.cpp
+1
-1
kde/src/lib/CallModel.hpp
kde/src/lib/CallModel.hpp
+6
-1
No files found.
kde/src/SFLPhoneView.cpp
View file @
201847af
...
...
@@ -1040,13 +1040,14 @@ void SFLPhoneView::editBeforeCall()
void
SFLPhoneView
::
setAccountFirst
(
Account
*
account
)
{
qDebug
()
<<
"setAccountFirst : "
<<
(
account
?
account
->
getAlias
()
:
QString
());
qDebug
()
<<
"setAccountFirst : "
<<
(
account
?
account
->
getAlias
()
:
QString
())
<<
(
account
?
account
->
getAccountId
()
:
QString
());
if
(
account
)
{
CallView
::
setPriorAccountId
(
account
->
getAccountId
());
}
else
{
CallView
::
setPriorAccountId
(
QString
());
}
qDebug
()
<<
"Current account id"
<<
CallView
::
getCurrentAccountId
();
updateStatusMessage
();
}
...
...
kde/src/conf/dlgaccounts.cpp
View file @
201847af
...
...
@@ -164,7 +164,7 @@ void DlgAccounts::saveAccountList()
currentId
=
QString
(
current
->
getAccountId
());
}
}
qDebug
()
<<
currentId
<<
" : "
<<
current
->
isChecked
();
//
qDebug() << currentId << " : " << current->isChecked();
}
//remove accounts that are in the configurationManager but not in the client
for
(
int
i
=
0
;
i
<
accountIds
.
size
();
i
++
)
{
...
...
kde/src/lib/CallModel.hpp
View file @
201847af
...
...
@@ -159,7 +159,12 @@ template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>:
///Create a new dialing call from peer name and the account ID
template
<
typename
CallWidget
,
typename
Index
>
Call
*
CallModel
<
CallWidget
,
Index
>::
addDialingCall
(
const
QString
&
peerName
,
QString
account
)
{
Call
*
call
=
Call
::
buildDialingCall
(
generateCallId
(),
peerName
,
account
);
QString
account2
=
account
;
if
(
account2
.
isEmpty
())
{
account2
=
getCurrentAccountId
();
}
Call
*
call
=
Call
::
buildDialingCall
(
generateCallId
(),
peerName
,
account2
);
activeCalls
[
call
->
getCallId
()]
=
call
;
addCall
(
call
);
selectItem
(
call
);
...
...
Write
Preview
Markdown
is supported
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