Skip to content

xapp_get_tmp_dir: honour TMPDIR and XDG_RUNTIME_DIR (fixes blank tray icons) #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thexmeta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xapp_get_tmp_dir: honour TMPDIR and XDG_RUNTIME_DIR (fixes blank tray icons) #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions libxapp/xapp-util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,15 @@ xapp_pango_font_string_to_css (const char *pango_font_string)
/**
* xapp_get_tmp_dir:
*
* Provides the path to the system's temporary files folder. This is identical to g_get_tmp_dir,
* but includes the /dev/shm ramdisk as the first choice for a temporary folder.
*
* Provides the path to the system's temporary files folder.
*
* The first writable location among the following is used:
*
* 1. the `TMPDIR` environment variable, if set and non-empty
* 2. the `XDG_RUNTIME_DIR` environment variable
* 3. `/dev/shm`
* 4. the result of g_get_tmp_dir()
*
* Returns: (type filename) (transfer none): the directory to use for temporary files.
* Since: 2.2.16
*/
Expand All @@ -263,9 +269,20 @@ xapp_get_tmp_dir (void)

if (tmp_dir == NULL)
{
if (access ("/dev/shm", W_OK) == 0)
const gchar *env_dir = g_getenv ("TMPDIR");

if (env_dir == NULL || env_dir[0] == '\0')
{
env_dir = g_getenv ("XDG_RUNTIME_DIR");
}

if (env_dir != NULL && env_dir[0] != '\0' && access (env_dir, W_OK) == 0)
{
tmp_dir = g_strdup (env_dir);
}
else if (access ("/dev/shm", W_OK) == 0)
{
tmp_dir = "/dev/shm";
tmp_dir = g_strdup ("/dev/shm");
}
else
{
Expand Down