[gnome-games] gtali: Load images from standard data directory

[Robert Ancell <rancell src gnome org>]

commit 8e5ba8717eb5abccb4d075e46a08d625f836f1d9
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Jan 1 13:17:03 2012 +1100

    gtali: Load images from standard data directory

 gtali/data/Makefile.am |    2 +-
 gtali/src/Makefile.am  |    1 +
 gtali/src/gyahtzee.c   |    7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/gtali/data/Makefile.am b/gtali/data/Makefile.am
index b74adf4..d4f28cb 100644
--- a/gtali/data/Makefile.am
+++ b/gtali/data/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = icons
 
-pixmapdir = $(pkgdatadir)/gtali/pixmaps
+pixmapdir = $(datadir)/gtali
 pixmap_DATA = \
 	gnome-dice-1.svg \
 	gnome-dice-2.svg \
diff --git a/gtali/src/Makefile.am b/gtali/src/Makefile.am
index 1cb53b1..57ca9fe 100644
--- a/gtali/src/Makefile.am
+++ b/gtali/src/Makefile.am
@@ -14,6 +14,7 @@ gtali_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 gtali_CFLAGS = \
+	-DDATA_DIRECTORY=\"$(datadir)/gtali\" \
 	$(GTK_CFLAGS)	\
 	$(AM_CFLAGS)
 		
diff --git a/gtali/src/gyahtzee.c b/gtali/src/gyahtzee.c
index 33793bb..452e8fc 100644
--- a/gtali/src/gyahtzee.c
+++ b/gtali/src/gyahtzee.c
@@ -652,17 +652,14 @@ LoadDicePixmaps (void)
 {
   int i, j;
   char *path, *path_kismet;
-  const char *dir;
   GError *error = NULL;
 
-  dir = games_runtime_get_directory (GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY);
-
   for (i = 0; i < NUMBER_OF_PIXMAPS; i++) {
     /* This is not efficient, but it lets us load animated types,
      * there is no way for us to copy a general GtkImage (the old 
      * code had a way for static images). */
-    path = g_build_filename (dir, dicefiles[i], NULL);
-    path_kismet = g_build_filename (dir, kdicefiles[i], NULL);
+    path = g_build_filename (DATA_DIRECTORY, dicefiles[i], NULL);
+    path_kismet = g_build_filename (DATA_DIRECTORY, kdicefiles[i], NULL);
 
     if (g_file_test (path, G_FILE_TEST_EXISTS) && 
           g_file_test (path_kismet, G_FILE_TEST_EXISTS)) {