Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
566b1c0e
Commit
566b1c0e
authored
Jun 13, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/app/App): do not create linphone config when prefered language is fetched
parent
6cca4d14
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
App.cpp
linphone-desktop/src/app/App.cpp
+1
-1
Paths.cpp
linphone-desktop/src/app/paths/Paths.cpp
+5
-4
Paths.hpp
linphone-desktop/src/app/paths/Paths.hpp
+1
-1
No files found.
linphone-desktop/src/app/App.cpp
View file @
566b1c0e
...
@@ -83,7 +83,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
...
@@ -83,7 +83,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
// Try to use preferred locale.
// Try to use preferred locale.
QString
locale
=
::
Utils
::
coreStringToAppString
(
QString
locale
=
::
Utils
::
coreStringToAppString
(
linphone
::
Config
::
newWithFactory
(
linphone
::
Config
::
newWithFactory
(
Paths
::
getConfigFilePath
(
mParser
.
value
(
"config"
)),
""
)
->
getString
(
Paths
::
getConfigFilePath
(
mParser
.
value
(
"config"
)
,
false
),
""
)
->
getString
(
SettingsModel
::
UI_SECTION
,
"locale"
,
""
SettingsModel
::
UI_SECTION
,
"locale"
,
""
)
)
);
);
...
...
linphone-desktop/src/app/paths/Paths.cpp
View file @
566b1c0e
...
@@ -175,11 +175,12 @@ string Paths::getCapturesDirPath () {
...
@@ -175,11 +175,12 @@ string Paths::getCapturesDirPath () {
return
getWritableDirPath
(
QStandardPaths
::
writableLocation
(
QStandardPaths
::
AppLocalDataLocation
)
+
PATH_CAPTURES
);
return
getWritableDirPath
(
QStandardPaths
::
writableLocation
(
QStandardPaths
::
AppLocalDataLocation
)
+
PATH_CAPTURES
);
}
}
string
Paths
::
getConfigFilePath
(
const
QString
&
configPath
)
{
string
Paths
::
getConfigFilePath
(
const
QString
&
configPath
,
bool
writable
)
{
if
(
!
configPath
.
isEmpty
())
const
QString
&
path
=
configPath
.
isEmpty
()
return
getWritableFilePath
(
QFileInfo
(
configPath
).
absoluteFilePath
());
?
getAppConfigFilePath
()
:
QFileInfo
(
configPath
).
absoluteFilePath
();
return
getWritableFilePath
(
getAppConfigFilePath
()
);
return
writable
?
getWritableFilePath
(
path
)
:
getReadableFilePath
(
path
);
}
}
string
Paths
::
getFactoryConfigFilePath
()
{
string
Paths
::
getFactoryConfigFilePath
()
{
...
...
linphone-desktop/src/app/paths/Paths.hpp
View file @
566b1c0e
...
@@ -36,7 +36,7 @@ namespace Paths {
...
@@ -36,7 +36,7 @@ namespace Paths {
std
::
string
getAvatarsDirPath
();
std
::
string
getAvatarsDirPath
();
std
::
string
getCallHistoryFilePath
();
std
::
string
getCallHistoryFilePath
();
std
::
string
getCapturesDirPath
();
std
::
string
getCapturesDirPath
();
std
::
string
getConfigFilePath
(
const
QString
&
configPath
=
QString
());
std
::
string
getConfigFilePath
(
const
QString
&
configPath
=
QString
()
,
bool
writable
=
true
);
std
::
string
getFactoryConfigFilePath
();
std
::
string
getFactoryConfigFilePath
();
std
::
string
getFriendsListFilePath
();
std
::
string
getFriendsListFilePath
();
std
::
string
getDownloadDirPath
();
std
::
string
getDownloadDirPath
();
...
...
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