gnome-games r8109 - in trunk/gnotravex: . pixmaps

[thomashpa svn gnome org]

Author: thomashpa
Date: Sun Oct 19 12:03:45 2008
New Revision: 8109
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8109&view=rev

Log:
use games_runtime_get_directory () and move location to shared version af baize.png

Modified:
   trunk/gnotravex/Makefile.am
   trunk/gnotravex/gnotravex.c
   trunk/gnotravex/pixmaps/Makefile.am

Modified: trunk/gnotravex/Makefile.am
==============================================================================
--- trunk/gnotravex/Makefile.am	(original)
+++ trunk/gnotravex/Makefile.am	Sun Oct 19 12:03:45 2008
@@ -12,7 +12,7 @@
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libgames-support	\
 	-DDATADIR="\"$(datadir)\""		\
-	-DPIXMAPDIR=\""$(datadir)/pixmaps/gnotravex"\"	\
+	-DPIXMAPDIR=\""$(datadir)/gnome-games/pixmaps"\"	\
 	-DSHAREDIR="\"$(pkgdatadir)\""		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
 	$(AM_CPPFLAGS)

Modified: trunk/gnotravex/gnotravex.c
==============================================================================
--- trunk/gnotravex/gnotravex.c	(original)
+++ trunk/gnotravex/gnotravex.c	Sun Oct 19 12:03:45 2008
@@ -1979,10 +1979,12 @@
   GdkPixmap *pm;
   GdkPixbuf *pb;
   char *path;
+  const char * dname; 
   const char * filename = "baize.png";
   GError *error = NULL;
 
-  path = g_build_filename (PIXMAPDIR, filename, NULL);
+  dname = games_runtime_get_directory (GAMES_RUNTIME_PIXMAP_DIRECTORY);
+  path = g_build_filename (dname, filename, NULL);
   pb = gdk_pixbuf_new_from_file (path, &error);
   if (pb == NULL) {
     g_warning ("Error loading file '%s': %s\n", path, error->message);

Modified: trunk/gnotravex/pixmaps/Makefile.am
==============================================================================
--- trunk/gnotravex/pixmaps/Makefile.am	(original)
+++ trunk/gnotravex/pixmaps/Makefile.am	Sun Oct 19 12:03:45 2008
@@ -1,5 +1,4 @@
-# FIXME: this really should be below $(pkgdatadir) !
-imagedir      = $(datadir)/pixmaps/gnotravex
+imagedir      = $(pkgdatadir)/pixmaps
 image_DATA    = baize.png
 
 EXTRA_DIST    = $(image_DATA)