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

[Robert Ancell <rancell src gnome org>]

commit f5361ce95749d7e8ba64ead440bf99370373f3b7
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:04:24 2011 +1100

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

 configure.in                                       |    1 +
 quadrapassel/data/Makefile.am                      |    2 ++
 .../data/icons/16x16/quadrapassel.png              |  Bin 649 -> 649 bytes
 .../data/icons/22x22/quadrapassel.png              |  Bin 1110 -> 1110 bytes
 .../data/icons/24x24/quadrapassel.png              |  Bin 1146 -> 1146 bytes
 .../data/icons/32x32/quadrapassel.png              |  Bin 1429 -> 1429 bytes
 .../data/icons/48x48/quadrapassel.png              |  Bin 2094 -> 2094 bytes
 quadrapassel/data/icons/Makefile.am                |   13 +++++++++++++
 .../data/icons/scalable/quadrapassel.svg           |    0
 quadrapassel/data/quadrapassel.desktop.in.in       |    2 +-
 quadrapassel/src/main.cpp                          |    2 +-
 quadrapassel/src/tetris.cpp                        |    2 +-
 12 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 945eb54..12f374e 100644
--- a/configure.in
+++ b/configure.in
@@ -857,6 +857,7 @@ lightsoff/data/Makefile
 lightsoff/help/Makefile
 quadrapassel/Makefile
 quadrapassel/data/Makefile
+quadrapassel/data/icons/Makefile
 quadrapassel/help/Makefile
 quadrapassel/src/Makefile
 gnobots2/Makefile
diff --git a/quadrapassel/data/Makefile.am b/quadrapassel/data/Makefile.am
index 60f47f8..8737a2c 100644
--- a/quadrapassel/data/Makefile.am
+++ b/quadrapassel/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 pixmapdir = $(pkgdatadir)/quadrapassel/pixmaps
 pixmap_DATA = 
 	quadrapassel.svg \
diff --git a/icons/hicolor_apps_16x16_gnome-quadrapassel.png b/quadrapassel/data/icons/16x16/quadrapassel.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-quadrapassel.png
rename to quadrapassel/data/icons/16x16/quadrapassel.png
diff --git a/icons/hicolor_apps_22x22_gnome-quadrapassel.png b/quadrapassel/data/icons/22x22/quadrapassel.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-quadrapassel.png
rename to quadrapassel/data/icons/22x22/quadrapassel.png
diff --git a/icons/hicolor_apps_24x24_gnome-quadrapassel.png b/quadrapassel/data/icons/24x24/quadrapassel.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-quadrapassel.png
rename to quadrapassel/data/icons/24x24/quadrapassel.png
diff --git a/icons/hicolor_apps_32x32_gnome-quadrapassel.png b/quadrapassel/data/icons/32x32/quadrapassel.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-quadrapassel.png
rename to quadrapassel/data/icons/32x32/quadrapassel.png
diff --git a/icons/hicolor_apps_48x48_gnome-quadrapassel.png b/quadrapassel/data/icons/48x48/quadrapassel.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-quadrapassel.png
rename to quadrapassel/data/icons/48x48/quadrapassel.png
diff --git a/quadrapassel/data/icons/Makefile.am b/quadrapassel/data/icons/Makefile.am
new file mode 100644
index 0000000..e59b320
--- /dev/null
+++ b/quadrapassel/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/quadrapassel.png
+icon22_DATA = 22x22/quadrapassel.png
+icon24_DATA = 24x24/quadrapassel.png
+icon32_DATA = 32x32/quadrapassel.png
+icon48_DATA = 48x48/quadrapassel.png
+iconscalable_DATA = scalable/quadrapassel.svg
diff --git a/icons/hicolor_apps_scalable_gnome-quadrapassel.svg b/quadrapassel/data/icons/scalable/quadrapassel.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-quadrapassel.svg
rename to quadrapassel/data/icons/scalable/quadrapassel.svg
diff --git a/quadrapassel/data/quadrapassel.desktop.in.in b/quadrapassel/data/quadrapassel.desktop.in.in
index 2212e7a..aef8e18 100644
--- a/quadrapassel/data/quadrapassel.desktop.in.in
+++ b/quadrapassel/data/quadrapassel.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Quadrapassel
 _Comment=Fit falling blocks together
-Icon=gnome-quadrapassel
+Icon=quadrapassel
 Exec=quadrapassel
 Terminal=false
 Type=Application
diff --git a/quadrapassel/src/main.cpp b/quadrapassel/src/main.cpp
index f2a8da5..439de36 100644
--- a/quadrapassel/src/main.cpp
+++ b/quadrapassel/src/main.cpp
@@ -65,7 +65,7 @@ main(int argc, char *argv[])
 
 	g_set_application_name (_("Quadrapassel"));
 
-	gtk_window_set_default_icon_name ("gnome-quadrapassel");
+	gtk_window_set_default_icon_name ("quadrapassel");
 
 	games_conf_initialise ("Quadrapassel");
 
diff --git a/quadrapassel/src/tetris.cpp b/quadrapassel/src/tetris.cpp
index fbea3b5..028ba5d 100644
--- a/quadrapassel/src/tetris.cpp
+++ b/quadrapassel/src/tetris.cpp
@@ -1308,7 +1308,7 @@ Tetris::gameAbout(GtkAction *action, void *d)
 			       "authors", authors,
 			       "documenters", documenters,
 			       "translator-credits", _("translator-credits"),
-			       "logo-icon-name", "gnome-quadrapassel",
+			       "logo-icon-name", "quadrapassel",
 			       "website", "http://www.gnome.org/projects/gnome-games/";,
 			       "wrap-license", TRUE,
 			       NULL);