DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let packagers easily override the DATADIR

Browse Source
This commit is contained in:
Pierre Pronchery 2012-12-23 03:09:28 +01:00
parent ba593ca271
commit c10f37700f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/applets/main.c
View File

@ -27,6 +27,14 @@
#include "../../config.h" #include "../../config.h"
#define _(string) gettext(string) #define _(string) gettext(string)
/* constants */
#ifndef PREFIX
# define PREFIX "/usr/local"
#endif
#ifndef DATADIR
# define DATADIR PREFIX "/share"
#endif
/* XXX to avoid pointless warnings with GCC */ /* XXX to avoid pointless warnings with GCC */
#define main _main #define main _main
@ -288,7 +296,7 @@ static GtkWidget * _main_image(char const * name)
&& (name != NULL && (len = strlen(name)) > 4) && (name != NULL && (len = strlen(name)) > 4)
&& (strcmp(&name[len - 4], ".png") == 0 && (strcmp(&name[len - 4], ".png") == 0
|| strcmp(&name[len - 4], ".xpm") == 0) || strcmp(&name[len - 4], ".xpm") == 0)
&& (buf = string_new_append(PREFIX, "/share/pixmaps/", && (buf = string_new_append(DATADIR, "/pixmaps/",
name, NULL)) != NULL) name, NULL)) != NULL)
{ {
pixbuf = gdk_pixbuf_new_from_file_at_size(buf, width, height, pixbuf = gdk_pixbuf_new_from_file_at_size(buf, width, height,
@ -409,7 +417,7 @@ static gint _idle_apps_compare(gconstpointer a, gconstpointer b);
static gboolean _on_idle(gpointer data) static gboolean _on_idle(gpointer data)
{ {
Main * main = data; Main * main = data;
const char path[] = PREFIX "/share/applications"; const char path[] = DATADIR "/applications";
DIR * dir; DIR * dir;
int fd; int fd;
struct stat st; struct stat st;
@ -578,7 +586,7 @@ static void _on_suspend(gpointer data)
static gboolean _on_timeout(gpointer data) static gboolean _on_timeout(gpointer data)
{ {
Main * main = data; Main * main = data;
const char path[] = PREFIX "/share/applications"; const char path[] = DATADIR "/applications";
struct stat st; struct stat st;
if(stat(path, &st) != 0) if(stat(path, &st) != 0)