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

[Robert Ancell <rancell src gnome org>]

commit 4a1984f493a8383be7df44d042d8bd04d972f3a1
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:01:16 2011 +1100

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

 configure.in                                       |    1 +
 gnotski/data/Makefile.am                           |    2 ++
 gnotski/data/gnotski.desktop.in.in                 |    2 +-
 .../data/icons/16x16/gnotski.png                   |  Bin 554 -> 554 bytes
 .../data/icons/22x22/gnotski.png                   |  Bin 909 -> 909 bytes
 .../data/icons/24x24/gnotski.png                   |  Bin 885 -> 885 bytes
 .../data/icons/32x32/gnotski.png                   |  Bin 1440 -> 1440 bytes
 .../data/icons/48x48/gnotski.png                   |  Bin 2252 -> 2252 bytes
 gnotski/data/icons/Makefile.am                     |   13 +++++++++++++
 .../data/icons/scalable/gnotski.svg                |    0
 gnotski/src/gnotski.c                              |    4 ++--
 11 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index fe9f114..945eb54 100644
--- a/configure.in
+++ b/configure.in
@@ -843,6 +843,7 @@ gnotravex/src/Makefile
 gnotravex/help/Makefile
 gnotski/Makefile
 gnotski/data/Makefile
+gnotski/data/icons/Makefile
 gnotski/src/Makefile
 gnotski/help/Makefile
 glines/Makefile
diff --git a/gnotski/data/Makefile.am b/gnotski/data/Makefile.am
index 5622dfb..5d9b6bc 100644
--- a/gnotski/data/Makefile.am
+++ b/gnotski/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 pixmapdir = $(pkgdatadir)/gnotski/pixmaps
 pixmap_DATA = \
 	gnotski.svg	\
diff --git a/gnotski/data/gnotski.desktop.in.in b/gnotski/data/gnotski.desktop.in.in
index 8925768..e551052 100644
--- a/gnotski/data/gnotski.desktop.in.in
+++ b/gnotski/data/gnotski.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Klotski
 _Comment=Slide blocks to solve the puzzle
 Exec=gnotski
-Icon=gnome-klotski
+Icon=gnotski
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
diff --git a/icons/hicolor_apps_16x16_gnome-klotski.png b/gnotski/data/icons/16x16/gnotski.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-klotski.png
rename to gnotski/data/icons/16x16/gnotski.png
diff --git a/icons/hicolor_apps_22x22_gnome-klotski.png b/gnotski/data/icons/22x22/gnotski.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-klotski.png
rename to gnotski/data/icons/22x22/gnotski.png
diff --git a/icons/hicolor_apps_24x24_gnome-klotski.png b/gnotski/data/icons/24x24/gnotski.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-klotski.png
rename to gnotski/data/icons/24x24/gnotski.png
diff --git a/icons/hicolor_apps_32x32_gnome-klotski.png b/gnotski/data/icons/32x32/gnotski.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-klotski.png
rename to gnotski/data/icons/32x32/gnotski.png
diff --git a/icons/hicolor_apps_48x48_gnome-klotski.png b/gnotski/data/icons/48x48/gnotski.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-klotski.png
rename to gnotski/data/icons/48x48/gnotski.png
diff --git a/gnotski/data/icons/Makefile.am b/gnotski/data/icons/Makefile.am
new file mode 100644
index 0000000..6e211a8
--- /dev/null
+++ b/gnotski/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/gnotski.png
+icon22_DATA = 22x22/gnotski.png
+icon24_DATA = 24x24/gnotski.png
+icon32_DATA = 32x32/gnotski.png
+icon48_DATA = 48x48/gnotski.png
+iconscalable_DATA = scalable/gnotski.svg
diff --git a/icons/hicolor_apps_scalable_gnome-klotski.svg b/gnotski/data/icons/scalable/gnotski.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-klotski.svg
rename to gnotski/data/icons/scalable/gnotski.svg
diff --git a/gnotski/src/gnotski.c b/gnotski/src/gnotski.c
index 3380ea8..f2feedb 100644
--- a/gnotski/src/gnotski.c
+++ b/gnotski/src/gnotski.c
@@ -504,7 +504,7 @@ main (int argc, char **argv)
 
   games_stock_init ();
 
-  gtk_window_set_default_icon_name ("gnome-klotski");
+  gtk_window_set_default_icon_name ("gnotski");
   
 #ifdef WITH_SMCLIENT
   sm_client = egg_sm_client_get ();
@@ -1492,7 +1492,7 @@ about_cb (GtkAction * action)
                          "authors", authors,
 			 "documenters", documenters,
                          "translator-credits", _("translator-credits"),
-                         "logo-icon-name", "gnome-klotski",
+                         "logo-icon-name", "gnotski",
                          "website", "http://www.gnome.org/projects/gnome-games";,
                          "website-label", _("GNOME Games web site"),
                          NULL);