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

[Robert Ancell <rancell src gnome org>]

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

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

 configure.in                                       |    1 +
 gtali/data/Makefile.am                             |    2 ++
 gtali/data/gtali.desktop.in.in                     |    2 +-
 .../data/icons/16x16/gtali.png                     |  Bin 641 -> 641 bytes
 .../data/icons/22x22/gtali.png                     |  Bin 1381 -> 1381 bytes
 .../data/icons/24x24/gtali.png                     |  Bin 1400 -> 1400 bytes
 .../data/icons/32x32/gtali.png                     |  Bin 2431 -> 2431 bytes
 .../data/icons/48x48/gtali.png                     |  Bin 3406 -> 3406 bytes
 gtali/data/icons/Makefile.am                       |   13 +++++++++++++
 .../data/icons/scalable/gtali.svg                  |    0
 gtali/src/gyahtzee.c                               |    4 ++--
 11 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 53431b8..211c44a 100644
--- a/configure.in
+++ b/configure.in
@@ -828,6 +828,7 @@ mahjongg/help/Makefile
 mahjongg/src/Makefile
 gtali/Makefile
 gtali/data/Makefile
+gtali/data/icons/Makefile
 gtali/src/Makefile
 gtali/help/Makefile
 iagno/Makefile
diff --git a/gtali/data/Makefile.am b/gtali/data/Makefile.am
index 0106cbb..b74adf4 100644
--- a/gtali/data/Makefile.am
+++ b/gtali/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 pixmapdir = $(pkgdatadir)/gtali/pixmaps
 pixmap_DATA = \
 	gnome-dice-1.svg \
diff --git a/gtali/data/gtali.desktop.in.in b/gtali/data/gtali.desktop.in.in
index 2e87ab6..8467085 100644
--- a/gtali/data/gtali.desktop.in.in
+++ b/gtali/data/gtali.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Tali
 _Comment=Beat the odds in a poker-style dice game
 Exec=gtali
-Icon=gnome-tali
+Icon=gtali
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;CardGame;
diff --git a/icons/hicolor_apps_16x16_gnome-tali.png b/gtali/data/icons/16x16/gtali.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-tali.png
rename to gtali/data/icons/16x16/gtali.png
diff --git a/icons/hicolor_apps_22x22_gnome-tali.png b/gtali/data/icons/22x22/gtali.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-tali.png
rename to gtali/data/icons/22x22/gtali.png
diff --git a/icons/hicolor_apps_24x24_gnome-tali.png b/gtali/data/icons/24x24/gtali.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-tali.png
rename to gtali/data/icons/24x24/gtali.png
diff --git a/icons/hicolor_apps_32x32_gnome-tali.png b/gtali/data/icons/32x32/gtali.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-tali.png
rename to gtali/data/icons/32x32/gtali.png
diff --git a/icons/hicolor_apps_48x48_gnome-tali.png b/gtali/data/icons/48x48/gtali.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-tali.png
rename to gtali/data/icons/48x48/gtali.png
diff --git a/gtali/data/icons/Makefile.am b/gtali/data/icons/Makefile.am
new file mode 100644
index 0000000..d27b039
--- /dev/null
+++ b/gtali/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/gtali.png
+icon22_DATA = 22x22/gtali.png
+icon24_DATA = 24x24/gtali.png
+icon32_DATA = 32x32/gtali.png
+icon48_DATA = 48x48/gtali.png
+iconscalable_DATA = scalable/gtali.svg
diff --git a/icons/hicolor_apps_scalable_gnome-tali.svg b/gtali/data/icons/scalable/gtali.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-tali.svg
rename to gtali/data/icons/scalable/gtali.svg
diff --git a/gtali/src/gyahtzee.c b/gtali/src/gyahtzee.c
index 52e2b96..4583fac 100644
--- a/gtali/src/gyahtzee.c
+++ b/gtali/src/gyahtzee.c
@@ -615,7 +615,7 @@ about_cb (GtkAction * action, gpointer data)
 			 "authors", authors,
 			 "documenters", documenters,
 			 "translator-credits", _("translator-credits"),
-			 "logo-icon-name", "gnome-tali",
+			 "logo-icon-name", "gtali",
 			 "website",
 			 "http://www.gnome.org/projects/gnome-games/";,
 			 "website-label", _("GNOME Games web site"),
@@ -952,7 +952,7 @@ main (int argc, char *argv[])
                                  0 /* default category */,
                                  GAMES_SCORES_STYLE_PLAIN_DESCENDING);
 
-  gtk_window_set_default_icon_name ("gnome-tali");
+  gtk_window_set_default_icon_name ("gtali");
 
   if (NumberOfComputers == 0)	/* Not set on the command-line. */
     NumberOfComputers = games_conf_get_integer (NULL, KEY_NUMBER_OF_COMPUTERS, NULL);