mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shared: Update all users of DATADIR

Browse Source 
Replace every use of DATADIR to create a filename with a call to the new
function that allows overriding DATADIR with an env var at runtime.

No attention is paid to asprintf failure.

This restores make distcheck to a passing state after commit 6b58ea
began checking cairo surfaces for validity and exchanged undefined
behaviour we shouldn't have been dependent on for consistent test failure.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
[Pekka: split if-branches into two lines]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Derek Foreman
2018-02-06 15:18:38 -06:00
committed by Pekka Paalanen
parent b7e3db6a76
commit e277276b85
4 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/frame.c
+29 -4
View File
@@ -34,6 +34,7 @@
#include <linux/input.h>
#include "cairo-util.h"
#include "shared/file-util.h"
enum frame_button_flags {
FRAME_BUTTON_ALIGN_RIGHT = 0x1,
@@ -357,41 +358,65 @@ frame_create(struct theme *t, int32_t width, int32_t height, uint32_t buttons,
FRAME_STATUS_MENU,
FRAME_BUTTON_CLICK_DOWN);
} else {
char *name = file_name_with_datadir("icon_window.png");
if (!name)
goto free_frame;
button = frame_button_create(frame,
DATADIR "/weston/icon_window.png",
name,
FRAME_STATUS_MENU,
FRAME_BUTTON_CLICK_DOWN);
free(name);
}
if (!button)
goto free_frame;
}
if (buttons & FRAME_BUTTON_CLOSE) {
char *name = file_name_with_datadir("sign_close.png");
if (!name)
goto free_frame;
button = frame_button_create(frame,
DATADIR "/weston/sign_close.png",
name,
FRAME_STATUS_CLOSE,
FRAME_BUTTON_ALIGN_RIGHT |
FRAME_BUTTON_DECORATED);
free(name);
if (!button)
goto free_frame;
}
if (buttons & FRAME_BUTTON_MAXIMIZE) {
char *name = file_name_with_datadir("sign_maximize.png");
if (!name)
goto free_frame;
button = frame_button_create(frame,
DATADIR "/weston/sign_maximize.png",
name,
FRAME_STATUS_MAXIMIZE,
FRAME_BUTTON_ALIGN_RIGHT |
FRAME_BUTTON_DECORATED);
free(name);
if (!button)
goto free_frame;
}
if (buttons & FRAME_BUTTON_MINIMIZE) {
char *name = file_name_with_datadir("sign_minimize.png");
if (!name)
goto free_frame;
button = frame_button_create(frame,
DATADIR "/weston/sign_minimize.png",
name,
FRAME_STATUS_MINIMIZE,
FRAME_BUTTON_ALIGN_RIGHT |
FRAME_BUTTON_DECORATED);
free(name);
if (!button)
goto free_frame;
}