Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-windows
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
3fc824d7
Commit
3fc824d7
authored
Jan 02, 2019
by
Andreas Traczyk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wizard: update account information after creating first account
Change-Id: I4f952f145184f74b5d744623bb6e2dd182e6ceae
parent
3d0276c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
callwidget.cpp
callwidget.cpp
+9
-0
newwizardwidget.cpp
newwizardwidget.cpp
+5
-5
videooverlay.cpp
videooverlay.cpp
+1
-1
No files found.
callwidget.cpp
View file @
3fc824d7
...
...
@@ -235,6 +235,15 @@ CallWidget::navigated(bool to)
if
(
to
)
{
updateSmartList
();
connectConversationModel
();
try
{
auto
accountList
=
LRCInstance
::
accountModel
().
getAccountList
();
if
(
accountList
.
size
()
==
1
)
{
auto
index
=
Utils
::
indexInVector
(
accountList
,
LRCInstance
::
getCurrAccId
());
if
(
index
!=
-
1
)
{
slotAccountChanged
(
index
);
}
}
}
catch
(...)
{}
ui
->
currentAccountComboBox
->
updateComboBoxDisplay
();
}
else
{
QObject
::
disconnect
(
smartlistSelectionConnection_
);
...
...
newwizardwidget.cpp
View file @
3fc824d7
...
...
@@ -413,11 +413,6 @@ NewWizardWidget::createRingAccount(const QString &displayName,
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
accountId
);
confProps
.
Ringtone
.
ringtonePath
=
Utils
::
GetRingtonePath
().
toStdString
();
LRCInstance
::
accountModel
().
setAccountConfig
(
accountId
,
confProps
);
LRCInstance
::
editableAccountModel
()
->
registerName
(
LRCInstance
::
getCurrAccId
(),
""
,
registeredName_
.
toStdString
()
);
connect
(
LRCInstance
::
editableAccountModel
(),
&
lrc
::
api
::
NewAccountModel
::
nameRegistrationEnded
,
[
this
]
{
...
...
@@ -425,6 +420,11 @@ NewWizardWidget::createRingAccount(const QString &displayName,
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
accountProperties
);
emit
NavigationRequested
(
ScreenEnum
::
CallScreen
);
});
LRCInstance
::
editableAccountModel
()
->
registerName
(
LRCInstance
::
getCurrAccId
(),
""
,
registeredName_
.
toStdString
()
);
if
(
ui
->
setAvatarWidget
->
hasAvatar
())
{
LRCInstance
::
setCurrAccAvatar
(
ui
->
setAvatarWidget
->
getAvatarPixmap
());
}
...
...
videooverlay.cpp
View file @
3fc824d7
...
...
@@ -57,8 +57,8 @@ VideoOverlay::VideoOverlay(QWidget* parent) :
[
this
](
const
std
::
string
&
tempCallId
)
{
callId
=
tempCallId
;
});
QObject
::
disconnect
(
*
connection
);
if
(
connection
)
{
QObject
::
disconnect
(
*
connection
);
delete
connection
;
}
});
...
...
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