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

[Robert Ancell <rancell src gnome org>]

commit 19eb1b8a58e9b12740e7ea806a2da58a457864ec
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:13:13 2011 +1100

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

 configure.in                                       |    1 +
 gnibbles/data/Makefile.am                          |    2 +-
 gnibbles/data/gnibbles.desktop.in.in               |    2 +-
 .../data/icons/16x16/gnibbles.png                  |  Bin 749 -> 749 bytes
 .../data/icons/22x22/gnibbles.png                  |  Bin 1138 -> 1138 bytes
 .../data/icons/24x24/gnibbles.png                  |  Bin 1181 -> 1181 bytes
 .../data/icons/32x32/gnibbles.png                  |  Bin 2101 -> 2101 bytes
 .../data/icons/48x48/gnibbles.png                  |  Bin 3452 -> 3452 bytes
 gnibbles/data/icons/Makefile.am                    |   13 +++++++++++++
 .../data/icons/scalable/gnibbles.svg               |    0
 gnibbles/src/main.c                                |    4 ++--
 11 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index 211c44a..6605948 100644
--- a/configure.in
+++ b/configure.in
@@ -868,6 +868,7 @@ gnobots2/help/Makefile
 gnobots2/src/Makefile
 gnibbles/Makefile
 gnibbles/data/Makefile
+gnibbles/data/icons/Makefile
 gnibbles/data/levels/Makefile
 gnibbles/data/pix/Makefile
 gnibbles/help/Makefile
diff --git a/gnibbles/data/Makefile.am b/gnibbles/data/Makefile.am
index b0fa5ae..f97c373 100644
--- a/gnibbles/data/Makefile.am
+++ b/gnibbles/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = levels pix
+SUBDIRS = icons levels pix
 
 pixmapdir = $(datadir)/gnome-games/gnibbles/pixmaps
 pixmap_DATA = gnibbles-logo.svg
diff --git a/gnibbles/data/gnibbles.desktop.in.in b/gnibbles/data/gnibbles.desktop.in.in
index c51da49..d6d6460 100644
--- a/gnibbles/data/gnibbles.desktop.in.in
+++ b/gnibbles/data/gnibbles.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Nibbles
 _Comment=Guide a worm around a maze
 Exec=gnibbles
-Icon=gnome-gnibbles
+Icon=gnibbles
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;ArcadeGame;
diff --git a/icons/hicolor_apps_16x16_gnome-gnibbles.png b/gnibbles/data/icons/16x16/gnibbles.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-gnibbles.png
rename to gnibbles/data/icons/16x16/gnibbles.png
diff --git a/icons/hicolor_apps_22x22_gnome-gnibbles.png b/gnibbles/data/icons/22x22/gnibbles.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-gnibbles.png
rename to gnibbles/data/icons/22x22/gnibbles.png
diff --git a/icons/hicolor_apps_24x24_gnome-gnibbles.png b/gnibbles/data/icons/24x24/gnibbles.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-gnibbles.png
rename to gnibbles/data/icons/24x24/gnibbles.png
diff --git a/icons/hicolor_apps_32x32_gnome-gnibbles.png b/gnibbles/data/icons/32x32/gnibbles.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-gnibbles.png
rename to gnibbles/data/icons/32x32/gnibbles.png
diff --git a/icons/hicolor_apps_48x48_gnome-gnibbles.png b/gnibbles/data/icons/48x48/gnibbles.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-gnibbles.png
rename to gnibbles/data/icons/48x48/gnibbles.png
diff --git a/gnibbles/data/icons/Makefile.am b/gnibbles/data/icons/Makefile.am
new file mode 100644
index 0000000..fd18b62
--- /dev/null
+++ b/gnibbles/data/icons/Makefile.am
@@ -0,0 +1,13 @@
+icon16dir=$(datadir)/icons/hicolor/16x16/apps
+icon22dir=$(datadir)/icons/hicolor/22x22/apps
+icon24dir=$(datadir)/icons/hicolor/24x24/apps
+icon32dir=$(datadir)/icons/hicolor/32x32/apps
+icon48dir=$(datadir)/icons/hicolor/48x48/apps
+iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
+
+icon16_DATA = 16x16/gnibbles.png
+icon22_DATA = 22x22/gnibbles.png
+icon24_DATA = 24x24/gnibbles.png
+icon32_DATA = 32x32/gnibbles.png
+icon48_DATA = 48x48/gnibbles.png
+iconscalable_DATA = scalable/gnibbles.svg
diff --git a/icons/hicolor_apps_scalable_gnome-gnibbles.svg b/gnibbles/data/icons/scalable/gnibbles.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-gnibbles.svg
rename to gnibbles/data/icons/scalable/gnibbles.svg
diff --git a/gnibbles/src/main.c b/gnibbles/src/main.c
index 7f1b94d..21af74a 100644
--- a/gnibbles/src/main.c
+++ b/gnibbles/src/main.c
@@ -172,7 +172,7 @@ about_cb (GtkAction * action, gpointer data)
        "authors", authors,
        "documenters", documenters, "translator-credits",
        _("translator-credits"), "logo-icon-name",
-       "gnome-gnibbles", "website",
+       "gnibbles", "website",
        "http://www.gnome.org/projects/gnome-games/";,
        "website-label", _("GNOME Games web site"),
        "wrap-license", TRUE, NULL);
@@ -919,7 +919,7 @@ main (int argc, char **argv)
     exit (1);
   }
 
-  gtk_window_set_default_icon_name ("gnome-gnibbles");
+  gtk_window_set_default_icon_name ("gnibbles");
   srand (time (NULL));
 
   highscores = games_scores_new ("gnibbles",