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

[Robert Ancell <rancell src gnome org>]

commit dfbd46794eda7a56a702812634be709ca0bbdd66
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:16:43 2011 +1100

    swell-foop: Move icons into <game>/data/ directories

 configure.in                                       |    1 +
 swell-foop/Makefile.am                             |    2 +-
 .../data/icons/16x16/swell-foop.png                |  Bin 876 -> 876 bytes
 .../data/icons/22x22/swell-foop.png                |  Bin 1031 -> 1031 bytes
 .../data/icons/24x24/swell-foop.png                |  Bin 1071 -> 1071 bytes
 .../data/icons/32x32/swell-foop.png                |  Bin 2218 -> 2218 bytes
 .../data/icons/48x48/swell-foop.png                |  Bin 2774 -> 2774 bytes
 swell-foop/data/icons/Makefile.am                  |   13 +++++++++++++
 .../data/icons/scalable/swell-foop.svg             |    0
 swell-foop/data/settings.ui                        |    2 +-
 swell-foop/data/swell-foop.ui                      |    2 +-
 swell-foop/src/About.js                            |    2 +-
 swell-foop/swell-foop.desktop.in.in                |    2 +-
 13 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index 6605948..b0b8751 100644
--- a/configure.in
+++ b/configure.in
@@ -892,6 +892,7 @@ gnome-sudoku/data/Makefile
 gnome-sudoku/data/icons/Makefile
 gnome-sudoku/images/Makefile
 gnome-sudoku/help/Makefile
+swell-foop/data/icons/Makefile
 swell-foop/data/themes/Makefile
 swell-foop/data/themes/colors/Makefile
 swell-foop/data/themes/shapesandcolors/Makefile
diff --git a/swell-foop/Makefile.am b/swell-foop/Makefile.am
index b68619f..b0d63c1 100644
--- a/swell-foop/Makefile.am
+++ b/swell-foop/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data/themes src
+SUBDIRS = data/icons data/themes src
 
 if BUILD_HELP
 SUBDIRS += help
diff --git a/icons/hicolor_apps_16x16_gnome-swell-foop.png b/swell-foop/data/icons/16x16/swell-foop.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-swell-foop.png
rename to swell-foop/data/icons/16x16/swell-foop.png
diff --git a/icons/hicolor_apps_22x22_gnome-swell-foop.png b/swell-foop/data/icons/22x22/swell-foop.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-swell-foop.png
rename to swell-foop/data/icons/22x22/swell-foop.png
diff --git a/icons/hicolor_apps_24x24_gnome-swell-foop.png b/swell-foop/data/icons/24x24/swell-foop.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-swell-foop.png
rename to swell-foop/data/icons/24x24/swell-foop.png
diff --git a/icons/hicolor_apps_32x32_gnome-swell-foop.png b/swell-foop/data/icons/32x32/swell-foop.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-swell-foop.png
rename to swell-foop/data/icons/32x32/swell-foop.png
diff --git a/icons/hicolor_apps_48x48_gnome-swell-foop.png b/swell-foop/data/icons/48x48/swell-foop.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-swell-foop.png
rename to swell-foop/data/icons/48x48/swell-foop.png
diff --git a/swell-foop/data/icons/Makefile.am b/swell-foop/data/icons/Makefile.am
new file mode 100644
index 0000000..864b5de
--- /dev/null
+++ b/swell-foop/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/swell-foop.png
+icon22_DATA = 22x22/swell-foop.png
+icon24_DATA = 24x24/swell-foop.png
+icon32_DATA = 32x32/swell-foop.png
+icon48_DATA = 48x48/swell-foop.png
+iconscalable_DATA = scalable/swell-foop.svg
diff --git a/icons/hicolor_apps_scalable_gnome-swell-foop.svg b/swell-foop/data/icons/scalable/swell-foop.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-swell-foop.svg
rename to swell-foop/data/icons/scalable/swell-foop.svg
diff --git a/swell-foop/data/settings.ui b/swell-foop/data/settings.ui
index 81d8ede..101dfd9 100644
--- a/swell-foop/data/settings.ui
+++ b/swell-foop/data/settings.ui
@@ -5,7 +5,7 @@
   <object class="GtkDialog" id="dialog1">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Swell Foop</property>
-    <property name="icon_name">gnome-swell-foop</property>
+    <property name="icon_name">swell-foop</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
diff --git a/swell-foop/data/swell-foop.ui b/swell-foop/data/swell-foop.ui
index ac15a3f..2d36659 100644
--- a/swell-foop/data/swell-foop.ui
+++ b/swell-foop/data/swell-foop.ui
@@ -4,7 +4,7 @@
 	<object class="GtkWindow" id="game_window">
 		<signal name="hide" handler="quit"/>
 		<property name="title" translatable="yes">Swell Foop</property>
-		<property name="icon_name">gnome-swell-foop</property>
+		<property name="icon_name">swell-foop</property>
 		<property name="resizable">False</property>
 		<accel-groups>
 			<group name="accel_group"/>
diff --git a/swell-foop/src/About.js b/swell-foop/src/About.js
index ed60ce7..3610269 100644
--- a/swell-foop/src/About.js
+++ b/swell-foop/src/About.js
@@ -14,7 +14,7 @@ function show_about_dialog()
 	about_dialog.copyright = _("Copyright \xa9 2009 Tim Horton");
 	about_dialog.license = GnomeGamesSupport.get_license(_("Swell Foop"));
 	about_dialog.wrap_license = true;
-	about_dialog.logo_icon_name = "gnome-swell-foop";
+	about_dialog.logo_icon_name = "swell-foop";
 	about_dialog.website = "http://www.gnome.org/projects/gnome-games/";;
 	about_dialog.website_label = _("GNOME Games web site"); // this doesn't work for anyone
 	about_dialog.translator_credits = _("translator-credits");
diff --git a/swell-foop/swell-foop.desktop.in.in b/swell-foop/swell-foop.desktop.in.in
index c3aa1e0..0ecbcc1 100644
--- a/swell-foop/swell-foop.desktop.in.in
+++ b/swell-foop/swell-foop.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Swell Foop
 _Comment=Clear the screen by removing groups of colored and shaped tiles
-Icon=gnome-swell-foop
+Icon=swell-foop
 Exec=swell-foop
 Terminal=false
 Type=Application