Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
7ec68d32
Commit
7ec68d32
authored
1 year ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
callsettings: fix ringtone path selection
Change-Id: I033ee8497ad0424b9d106cace7eb796c7ced599b
parent
250fc6b7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/currentaccount.cpp
+5
-0
5 additions, 0 deletions
src/app/currentaccount.cpp
src/app/utils.cpp
+1
-1
1 addition, 1 deletion
src/app/utils.cpp
with
6 additions
and
1 deletion
src/app/currentaccount.cpp
+
5
−
0
View file @
7ec68d32
...
...
@@ -18,6 +18,8 @@
#include
"currentaccount.h"
#include
"utils.h"
CurrentAccount
::
CurrentAccount
(
LRCInstance
*
lrcInstance
,
AppSettingsManager
*
settingsManager
,
QObject
*
parent
)
...
...
@@ -188,6 +190,9 @@ CurrentAccount::updateData()
// Ringtone
set_ringtoneEnabledRingtone
(
accConfig
.
Ringtone
.
ringtoneEnabled
,
true
);
set_ringtonePathRingtone
(
accConfig
.
Ringtone
.
ringtonePath
,
true
);
if
(
get_ringtonePathRingtone
()
==
"default.opus"
||
get_ringtonePathRingtone
().
isEmpty
())
{
set_ringtonePathRingtone
(
Utils
::
GetRingtonePath
(),
true
);
}
// Moderators
set_isAllModeratorsEnabled
(
lrcInstance_
->
accountModel
().
isAllModerators
(
...
...
This diff is collapsed.
Click to expand it.
src/app/utils.cpp
+
1
−
1
View file @
7ec68d32
...
...
@@ -341,7 +341,7 @@ Utils::GetRingtonePath()
#ifdef Q_OS_WIN
return
QCoreApplication
::
applicationDirPath
()
+
"
\\
ringtones
\\
default.opus"
;
#else
return
QString
(
"/usr/share/
ring
/ringtones/default.opus"
);
return
QString
(
"/usr/share/
jami
/ringtones/default.opus"
);
#endif
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment