Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-desktop
Merge requests
!1064
Display back button in login with 'assistant_go_directly_to_third_party_sip_account_login' option.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Julien Wadel
requested to merge
fix/third_party_option
into
master
5 months ago
Overview
0
Commits
1
Pipelines
1
Changes
2
0
0
Compare
master
master (base)
and
latest version
latest version
8aefe3d8
1 commit,
5 months ago
2 files
+
6
−
2
Expand all files
Preferences
Preferences
File browser
List view
Tree view
Compare changes
Inline
Side-by-side
Show whitespace changes
Show one file at a time
Search (e.g. *.vue) (Ctrl+P)
Linphone/view/Page/Form/Login/SIPLoginPage.qml
+
0
−
1
Options
View file @ 8aefe3d8
Edit in single-file editor
Open in Web IDE
Show full file
@@ -31,7 +31,6 @@ LoginLayout {
console
.
debug
(
"
[SIPLoginPage] User: return
"
)
mainItem
.
goBack
()
}
visible
:
!
SettingsCpp
.
assistantGoDirectlyToThirdPartySipAccountLogin
}
Image
{
fillMode
:
Image
.
PreserveAspectFit
Linphone/view/Page/Window/Main/MainWindow.qml
+
6
−
1
Options
View file @ 8aefe3d8
Edit in single-file editor
Open in Web IDE
Show full file
@@ -134,7 +134,12 @@ AbstractWindow {
Component
{
id
:
sipLoginPage
SIPLoginPage
{
onGoBack
:
mainWindowStackView
.
pop
()
onGoBack
:
{
if
(
SettingsCpp
.
assistantGoDirectlyToThirdPartySipAccountLogin
)
mainWindowStackView
.
replace
(
mainPage
)
else
mainWindowStackView
.
pop
()
}
onGoToRegister
:
mainWindowStackView
.
replace
(
registerPage
)
onConnectionSucceed
:
{
Menu
Explore
Projects
Groups
Topics
Snippets