summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--capplets/time-admin/src/Makefile.am5
-rw-r--r--capplets/time-admin/src/main.c3
-rw-r--r--capplets/time-admin/src/time-map.c12
3 files changed, 11 insertions, 9 deletions
diff --git a/capplets/time-admin/src/Makefile.am b/capplets/time-admin/src/Makefile.am
index 4898365c..23f218b8 100644
--- a/capplets/time-admin/src/Makefile.am
+++ b/capplets/time-admin/src/Makefile.am
@@ -11,8 +11,9 @@ mate_time_admin_LDFLAGS = -export-dynamic
AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
- -DDATADIR="\"$(datadir)\"" \
- -DMATELOCALEDIR="\"$(datadir)/locale\""
+ -DDATADIR="\"$(datadir)/mate-time-admin/icon/\"" \
+ -DMATELOCALEDIR="\"$(datadir)/locale\""\
+ -DTIMPZONEDIR="\"$(datadir)/mate-time-admin/map/\""
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES)
diff --git a/capplets/time-admin/src/main.c b/capplets/time-admin/src/main.c
index 14ef2917..295e0be1 100644
--- a/capplets/time-admin/src/main.c
+++ b/capplets/time-admin/src/main.c
@@ -21,7 +21,8 @@
#define LOCKFILE "/tmp/time-admin.pid"
#define TIME_ADMIN_PERMISSION "org.mate.user.admin.administration"
-#define ICONFILE "/usr/share/mate-time-admin/icon/mate-times-admin.png"
+#define APPICON "mate-times-admin.png"
+#define ICONFILE DATADIR APPICON
static gboolean CheckClockHealth(gpointer data)
{
diff --git a/capplets/time-admin/src/time-map.c b/capplets/time-admin/src/time-map.c
index cdda5577..10a3666e 100644
--- a/capplets/time-admin/src/time-map.c
+++ b/capplets/time-admin/src/time-map.c
@@ -333,13 +333,13 @@ cc_timezone_map_draw (GtkWidget *widget,
/* paint hilight */
if (gtk_widget_is_sensitive (widget))
{
- file = g_strdup_printf ("/usr/share/mate-time-admin/map/timezone_%s.png",
+ file = g_strdup_printf (TIMPZONEDIR"timezone_%s.png",
g_ascii_formatd (buf, sizeof (buf),
"%g", map->selected_offset));
}
else
{
- file = g_strdup_printf ("/usr/share/mate-time-admin/map/timezone_%s_dim.png",
+ file = g_strdup_printf (TIMPZONEDIR"timezone_%s_dim.png",
g_ascii_formatd (buf, sizeof (buf),
"%g", map->selected_offset));
}
@@ -542,14 +542,14 @@ timezone_map_init (TimezoneMap *map)
{
GError *err = NULL;
- map->orig_background = gdk_pixbuf_new_from_file ("/usr/share/mate-time-admin/map/bg.png",&err);
+ map->orig_background = gdk_pixbuf_new_from_file (TIMPZONEDIR"bg.png",&err);
if (!map->orig_background)
{
g_warning ("Could not load background image: %s",
(err) ? err->message : "Unknown error");
g_clear_error (&err);
}
- map->orig_background_dim = gdk_pixbuf_new_from_file("/usr/share/mate-time-admin/map/bg_dim.png",&err);
+ map->orig_background_dim = gdk_pixbuf_new_from_file(TIMPZONEDIR"bg_dim.png",&err);
if (!map->orig_background_dim)
{
g_warning ("Could not load background image: %s",
@@ -557,7 +557,7 @@ timezone_map_init (TimezoneMap *map)
g_clear_error (&err);
}
- map->orig_color_map = gdk_pixbuf_new_from_file ("/usr/share/mate-time-admin/map/cc.png",&err);
+ map->orig_color_map = gdk_pixbuf_new_from_file (TIMPZONEDIR"cc.png",&err);
if (!map->orig_color_map)
{
g_warning ("Could not load background image: %s",
@@ -565,7 +565,7 @@ timezone_map_init (TimezoneMap *map)
g_clear_error (&err);
}
- map->pin = gdk_pixbuf_new_from_file ("/usr/share/mate-time-admin/map/pin.png",&err);
+ map->pin = gdk_pixbuf_new_from_file (TIMPZONEDIR"pin.png",&err);
if (!map->pin)
{
g_warning ("Could not load pin icon: %s",