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

[Robert Ancell <rancell src gnome org>]

commit 800af138c119ec8a27bbb0e0b3e4b369053f47d2
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 15:53:38 2011 +1100

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

 configure.in                                       |    1 +
 mahjongg/data/Makefile.am                          |    2 ++
 .../data/icons/16x16/mahjongg.png                  |  Bin 598 -> 598 bytes
 .../data/icons/22x22/mahjongg.png                  |  Bin 1037 -> 1037 bytes
 .../data/icons/24x24/mahjongg.png                  |  Bin 1070 -> 1070 bytes
 .../data/icons/32x32/mahjongg.png                  |  Bin 1799 -> 1799 bytes
 .../data/icons/48x48/mahjongg.png                  |  Bin 2268 -> 2268 bytes
 mahjongg/data/icons/Makefile.am                    |   13 +++++++++++++
 .../data/icons/scalable/mahjongg.svg               |    0
 mahjongg/data/mahjongg.desktop.in.in               |    2 +-
 mahjongg/src/mahjongg.vala                         |    4 ++--
 11 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 22581a8..fe9f114 100644
--- a/configure.in
+++ b/configure.in
@@ -823,6 +823,7 @@ swell-foop/Makefile
 swell-foop/help/Makefile
 mahjongg/Makefile
 mahjongg/data/Makefile
+mahjongg/data/icons/Makefile
 mahjongg/help/Makefile
 mahjongg/src/Makefile
 gtali/Makefile
diff --git a/mahjongg/data/Makefile.am b/mahjongg/data/Makefile.am
index 8c47317..301e519 100644
--- a/mahjongg/data/Makefile.am
+++ b/mahjongg/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 mapdir = $(pkgdatadir)/mahjongg/games
 map_DATA = \
 	mahjongg.map	\
diff --git a/icons/hicolor_apps_16x16_gnome-mahjongg.png b/mahjongg/data/icons/16x16/mahjongg.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-mahjongg.png
rename to mahjongg/data/icons/16x16/mahjongg.png
diff --git a/icons/hicolor_apps_22x22_gnome-mahjongg.png b/mahjongg/data/icons/22x22/mahjongg.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-mahjongg.png
rename to mahjongg/data/icons/22x22/mahjongg.png
diff --git a/icons/hicolor_apps_24x24_gnome-mahjongg.png b/mahjongg/data/icons/24x24/mahjongg.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-mahjongg.png
rename to mahjongg/data/icons/24x24/mahjongg.png
diff --git a/icons/hicolor_apps_32x32_gnome-mahjongg.png b/mahjongg/data/icons/32x32/mahjongg.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-mahjongg.png
rename to mahjongg/data/icons/32x32/mahjongg.png
diff --git a/icons/hicolor_apps_48x48_gnome-mahjongg.png b/mahjongg/data/icons/48x48/mahjongg.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-mahjongg.png
rename to mahjongg/data/icons/48x48/mahjongg.png
diff --git a/mahjongg/data/icons/Makefile.am b/mahjongg/data/icons/Makefile.am
new file mode 100644
index 0000000..ee67f6b
--- /dev/null
+++ b/mahjongg/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/mahjongg.png
+icon22_DATA = 22x22/mahjongg.png
+icon24_DATA = 24x24/mahjongg.png
+icon32_DATA = 32x32/mahjongg.png
+icon48_DATA = 48x48/mahjongg.png
+iconscalable_DATA = scalable/mahjongg.svg
diff --git a/icons/hicolor_apps_scalable_gnome-mahjongg.svg b/mahjongg/data/icons/scalable/mahjongg.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-mahjongg.svg
rename to mahjongg/data/icons/scalable/mahjongg.svg
diff --git a/mahjongg/data/mahjongg.desktop.in.in b/mahjongg/data/mahjongg.desktop.in.in
index 1ca4359..62f04fc 100644
--- a/mahjongg/data/mahjongg.desktop.in.in
+++ b/mahjongg/data/mahjongg.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Mahjongg
 _Comment=Disassemble a pile of tiles by removing matching pairs
 Exec=mahjongg
-Icon=gnome-mahjongg
+Icon=mahjongg
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;BoardGame;
diff --git a/mahjongg/src/mahjongg.vala b/mahjongg/src/mahjongg.vala
index ee99f3d..d48b1ec 100644
--- a/mahjongg/src/mahjongg.vala
+++ b/mahjongg/src/mahjongg.vala
@@ -536,7 +536,7 @@ public class Mahjongg : Gtk.Application
                                "artists", artists,
                                "documenters", documenters,
                                "translator-credits", _("translator-credits"),
-                               "logo-icon-name", "gnome-mahjongg",
+                               "logo-icon-name", "mahjongg",
                                "website", "http://www.gnome.org/projects/gnome-games";,
                                "website-label", _("GNOME Games web site"),
                                null);
@@ -790,7 +790,7 @@ public class Mahjongg : Gtk.Application
         GnomeGamesSupport.stock_init ();
 
         Environment.set_application_name (_("Mahjongg"));
-        Gtk.Window.set_default_icon_name ("gnome-mahjongg");
+        Gtk.Window.set_default_icon_name ("mahjongg");
 
         var app = new Mahjongg ();
         app.start ();