[gnome-games] gnotravex: Move icons into <game>/data/ directories

[Robert Ancell <rancell src gnome org>]

commit 17693c2818ac6baaf3fd5f3e485cc10fb38c35b7
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 15:37:18 2011 +1100

    gnotravex: Move icons into <game>/data/ directories

 configure.in                                       |    1 +
 gnotravex/data/Makefile.am                         |    2 ++
 gnotravex/data/gnotravex.desktop.in.in             |    2 +-
 .../data/icons/16x16/gnotravex.png                 |  Bin 838 -> 838 bytes
 .../data/icons/22x22/gnotravex.png                 |  Bin 1523 -> 1523 bytes
 .../data/icons/24x24/gnotravex.png                 |  Bin 1578 -> 1578 bytes
 .../data/icons/32x32/gnotravex.png                 |  Bin 2993 -> 2993 bytes
 .../data/icons/48x48/gnotravex.png                 |  Bin 4941 -> 4941 bytes
 .../data/icons/scalable/gnotravex.svg              |    0
 gnotravex/src/gnotravex.vala                       |    4 ++--
 icons/Makefile.am                                  |   11 -----------
 11 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/configure.in b/configure.in
index c5c067e..5e93a5e 100644
--- a/configure.in
+++ b/configure.in
@@ -835,6 +835,7 @@ iagno/help/Makefile
 iagno/src/Makefile
 gnotravex/Makefile
 gnotravex/data/Makefile
+gnotravex/data/icons/Makefile
 gnotravex/data/gnotravex.desktop.in
 gnotravex/src/Makefile
 gnotravex/help/Makefile
diff --git a/gnotravex/data/Makefile.am b/gnotravex/data/Makefile.am
index 2589d05..d585e28 100644
--- a/gnotravex/data/Makefile.am
+++ b/gnotravex/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 desktop_in_files = gnotravex.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
diff --git a/gnotravex/data/gnotravex.desktop.in.in b/gnotravex/data/gnotravex.desktop.in.in
index 1c5695d..1f1a406 100644
--- a/gnotravex/data/gnotravex.desktop.in.in
+++ b/gnotravex/data/gnotravex.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Tetravex
 _Comment=Complete the puzzle by matching numbered tiles
 Exec=gnotravex
-Icon=gnome-tetravex
+Icon=gnotravex
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
diff --git a/icons/hicolor_apps_16x16_gnome-tetravex.png b/gnotravex/data/icons/16x16/gnotravex.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-tetravex.png
rename to gnotravex/data/icons/16x16/gnotravex.png
diff --git a/icons/hicolor_apps_22x22_gnome-tetravex.png b/gnotravex/data/icons/22x22/gnotravex.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-tetravex.png
rename to gnotravex/data/icons/22x22/gnotravex.png
diff --git a/icons/hicolor_apps_24x24_gnome-tetravex.png b/gnotravex/data/icons/24x24/gnotravex.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-tetravex.png
rename to gnotravex/data/icons/24x24/gnotravex.png
diff --git a/icons/hicolor_apps_32x32_gnome-tetravex.png b/gnotravex/data/icons/32x32/gnotravex.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-tetravex.png
rename to gnotravex/data/icons/32x32/gnotravex.png
diff --git a/icons/hicolor_apps_48x48_gnome-tetravex.png b/gnotravex/data/icons/48x48/gnotravex.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-tetravex.png
rename to gnotravex/data/icons/48x48/gnotravex.png
diff --git a/icons/hicolor_apps_scalable_gnome-tetravex.svg b/gnotravex/data/icons/scalable/gnotravex.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-tetravex.svg
rename to gnotravex/data/icons/scalable/gnotravex.svg
diff --git a/gnotravex/src/gnotravex.vala b/gnotravex/src/gnotravex.vala
index 1da6a99..344292d 100644
--- a/gnotravex/src/gnotravex.vala
+++ b/gnotravex/src/gnotravex.vala
@@ -37,7 +37,7 @@ public class Gnotravex : Gtk3.Application
 
         Environment.set_application_name (_("Tetravex"));
         GnomeGamesSupport.stock_init ();
-        Gtk.Window.set_default_icon_name ("gnome-tetravex");
+        Gtk.Window.set_default_icon_name ("gnotravex");
 
         add_action_entries (action_entries, this);
         pause = lookup_action ("pause") as SimpleAction;
@@ -216,7 +216,7 @@ public class Gnotravex : Gtk3.Application
                                "authors", authors,
                                "documenters", documenters,
                                "translator-credits", _("translator-credits"),
-                               "logo-icon-name", "gnome-tetravex",
+                               "logo-icon-name", "gnotravex",
                                "website", "http://www.gnome.org/projects/gnome-games";,
                                "website-label", _("GNOME Games web site"),
                                null);
diff --git a/icons/Makefile.am b/icons/Makefile.am
index c67e7f2..d8d8b56 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -59,17 +59,6 @@ dist_noinst_DATA += \
 	$(NULL)
 endif
 
-if BUILD_GNOTRAVEX
-dist_noinst_DATA += \
-	hicolor_apps_16x16_gnome-tetravex.png \
-	hicolor_apps_22x22_gnome-tetravex.png \
-	hicolor_apps_24x24_gnome-tetravex.png \
-	hicolor_apps_32x32_gnome-tetravex.png \
-	hicolor_apps_48x48_gnome-tetravex.png \
-	hicolor_apps_scalable_gnome-tetravex.svg \
-	$(NULL)
-endif
-
 if BUILD_GNOTSKI
 dist_noinst_DATA += \
 	hicolor_apps_16x16_gnome-klotski.png \