Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository 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-daemon
Commits
4361081e
Commit
4361081e
authored
10 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
osx: use official system data dir
Refs #67163 Change-Id: I0893e34cca8fbbab0cf011f3f698c16dcb559fc0
parent
d2c82ff3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/fileutils.cpp
+7
-2
7 additions, 2 deletions
daemon/src/fileutils.cpp
with
7 additions
and
2 deletions
daemon/src/fileutils.cpp
+
7
−
2
View file @
4361081e
...
...
@@ -311,7 +311,7 @@ get_cache_dir()
return
get_home_dir
()
+
DIR_SEPARATOR_STR
+
PACKAGE
;
#elif __APPLE__
return
get_home_dir
()
+
DIR_SEPARATOR_STR
+
"Library"
+
DIR_SEPARATOR_STR
+
"
Application Support
"
+
"Library"
+
DIR_SEPARATOR_STR
+
"
Caches
"
+
DIR_SEPARATOR_STR
+
PACKAGE
;
#else
return
get_home_dir
()
+
DIR_SEPARATOR_STR
+
...
...
@@ -350,7 +350,11 @@ get_data_dir()
{
#ifdef __ANDROID__
return
get_program_dir
();
#endif
#elif __APPLE__
return
get_home_dir
()
+
DIR_SEPARATOR_STR
+
"Library"
+
DIR_SEPARATOR_STR
+
"Application Support"
+
DIR_SEPARATOR_STR
+
PACKAGE
;
#else
const
std
::
string
data_home
(
XDG_DATA_HOME
);
if
(
not
data_home
.
empty
())
return
data_home
+
DIR_SEPARATOR_STR
+
PACKAGE
;
...
...
@@ -358,6 +362,7 @@ get_data_dir()
// $HOME/.local/share should be used."
return
get_home_dir
()
+
DIR_SEPARATOR_STR
".local"
DIR_SEPARATOR_STR
"share"
DIR_SEPARATOR_STR
+
PACKAGE
;
#endif
}
}}
// namespace ring::fileutils
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