gnome-games r8054 - trunk/glines

[thomashpa svn gnome org]

Author: thomashpa
Date: Fri Oct 17 00:01:31 2008
New Revision: 8054
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8054&view=rev

Log:
move glines to use new pixmaps dir from games-runtime

Modified:
   trunk/glines/Makefile.am
   trunk/glines/glines.c

Modified: trunk/glines/Makefile.am
==============================================================================
--- trunk/glines/Makefile.am	(original)
+++ trunk/glines/Makefile.am	Fri Oct 17 00:01:31 2008
@@ -2,8 +2,7 @@
 
 SUBDIRS = help
 
-# FIXMEchpe: this should really use pixmapdir = $(pkgdatadir)/glines/pixmaps !!
-pixmapdir = $(datadir)/pixmaps/glines
+pixmapdir = $(pkgdatadir)/glines/pixmaps
 pixmap_DATA = \
 	balls.svg	\
 	shapes.svg	\

Modified: trunk/glines/glines.c
==============================================================================
--- trunk/glines/glines.c	(original)
+++ trunk/glines/glines.c	Fri Oct 17 00:01:31 2008
@@ -33,6 +33,7 @@
 #include <glib/gi18n.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
+
 #include <games-scores.h>
 #include <games-scores-dialog.h>
 #include <games-frame.h>
@@ -214,15 +215,17 @@
 {
   GamesPreimage *preimage;
   gchar *path;
+  const char *dirname;
   GError *error = NULL;
 
-  path = g_build_filename (PIXMAPDIR, fname, NULL);
+  dirname = games_runtime_get_directory (GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY);
+  path = g_build_filename (dirname, fname, NULL);
   if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
     warning_message = g_strdup_printf (_("Unable to locate file:\n%s\n\n"
 					 "The default theme will be loaded instead."),
 				       fname);
 
-    path = g_build_filename (PIXMAPDIR, "balls.svg", NULL);
+    path = g_build_filename (dirname, "balls.svg", NULL);
     if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
       g_free (warning_message);
       warning_message = g_strdup_printf (_("Unable to locate file:\n%s\n\n"