[gnome-games] Move gnobots2 themes into separate directory (Bug #488974)

[Robert Ancell <rancell src gnome org>]

commit 3153821cb279e6735dd36c522555c9c278fe8b63
Author: Robert Ancell <robert ancell gmail com>
Date:   Tue Sep 1 11:49:40 2009 +1000

    Move gnobots2 themes into separate directory (Bug #488974)

 gnobots2/Makefile.am  |   15 +++++++++------
 gnobots2/graphics.c   |    8 ++++----
 gnobots2/properties.c |    2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
index 0154ce3..c92eb84 100644
--- a/gnobots2/Makefile.am
+++ b/gnobots2/Makefile.am
@@ -72,13 +72,15 @@ gnobots2_LDADD += $(GTHREAD_LIBS)
 endif
 
 pixmapdir = $(pkgdatadir)/gnobots2/pixmaps
-pixmap_DATA = gnomes.png \
-              yahoo.png \
+pixmap_DATA = yahoo.png \
               aieee.png \
-              splat.png \
-              robots.svg \
-              boo.svg \
-              ufo.svg
+              splat.png
+
+themedir = $(pkgdatadir)/gnobots2/themes
+theme_DATA = gnomes.png \
+             robots.svg \
+             boo.svg \
+             ufo.svg
 
 configdir = $(pkgdatadir)/gnobots2/games
 config_DATA = robots2.cfg \
@@ -94,6 +96,7 @@ Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 
 EXTRA_DIST = AUTHORS \
              $(pixmap_DATA) \
+             $(theme_DATA) \	     
              $(Games_DATA) \
              $(config_DATA) \
              $(schema_in_files)
diff --git a/gnobots2/graphics.c b/gnobots2/graphics.c
index 6e9c19e..c7bb442 100644
--- a/gnobots2/graphics.c
+++ b/gnobots2/graphics.c
@@ -209,20 +209,20 @@ gboolean
 load_game_graphics (void)
 {
   gchar *filename;
-  const char *pixmapdir;
+  const char *themedir;
 
   if (theme_preimage != NULL) {
     free_game_graphics ();
   }
 
-  pixmapdir = games_runtime_get_directory (GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY);
-  filename = games_find_similar_file (properties_theme_name (), pixmapdir);
+  themedir = games_runtime_get_directory (GAMES_RUNTIME_GAME_THEME_DIRECTORY);
+  filename = games_find_similar_file (properties_theme_name (), themedir);
 
   theme_preimage = games_preimage_new_from_file (filename, NULL);
   g_free (filename);
 
   if (theme_preimage == NULL) {
-    filename = games_find_similar_file ("robots", pixmapdir);
+    filename = games_find_similar_file ("robots", themedir);
     theme_preimage = games_preimage_new_from_file (filename, NULL);
     g_free (filename);
   }
diff --git a/gnobots2/properties.c b/gnobots2/properties.c
index aa34db8..32d70f4 100644
--- a/gnobots2/properties.c
+++ b/gnobots2/properties.c
@@ -344,7 +344,7 @@ make_theme_menu (void)
   if (theme_list)
     g_object_unref (theme_list);
 
-  pixmapdir = games_runtime_get_directory (GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY);
+  pixmapdir = games_runtime_get_directory (GAMES_RUNTIME_GAME_THEME_DIRECTORY);
   theme_list = games_file_list_new_images (pixmapdir, NULL);
   games_file_list_transform_basename (theme_list);