gnome-games r8238 - trunk/glines

[chpe svn gnome org]

Author: chpe
Date: Tue Nov  4 14:25:18 2008
New Revision: 8238
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8238&view=rev

Log:
Remove directory defines from CPPFLAGS to ensure they're not used, and replace remaining uses of the directory defines, if any, with games-runtime lookups.

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

Modified: trunk/glines/Makefile.am
==============================================================================
--- trunk/glines/Makefile.am	(original)
+++ trunk/glines/Makefile.am	Tue Nov  4 14:25:18 2008
@@ -16,12 +16,7 @@
 	$(NULL)
 
 glines_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/libgames-support	\
-	-DDATADIR="\"$(datadir)\""		\
-	-DSHAREDIR="\"$(pkgdatadir)\""		\
-	-DPIXMAPDIR="\"$(pixmapdir)\""		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
+	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
 
 glines_CFLAGS = \

Modified: trunk/glines/glines.c
==============================================================================
--- trunk/glines/glines.c	(original)
+++ trunk/glines/glines.c	Tue Nov  4 14:25:18 2008
@@ -1379,10 +1379,13 @@
 static GtkWidget *
 fill_menu (void)
 {
+  char *pixmap_dir;
+
   if (theme_file_list)
     g_object_unref (theme_file_list);
 
-  theme_file_list = games_file_list_new_images (PIXMAPDIR, NULL);
+  pixmap_dir = games_runtime_get_directory (GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY);
+  theme_file_list = games_file_list_new_images (pixmap_dir, NULL);
   games_file_list_transform_basename (theme_file_list);
 
   return games_file_list_create_widget (theme_file_list, ball_filename,