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

[Robert Ancell <rancell src gnome org>]

commit 1ab1ab4f2bbc147ca8ffae0df5c529c88b24a6bc
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:19:14 2011 +1100

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

 configure.in                                       |    1 +
 gnect/data/Makefile.am                             |    2 ++
 gnect/data/gnect.desktop.in.in                     |    2 +-
 .../data/icons/16x16/gnect.png                     |  Bin 562 -> 562 bytes
 .../data/icons/22x22/gnect.png                     |  Bin 1033 -> 1033 bytes
 .../data/icons/24x24/gnect.png                     |  Bin 1066 -> 1066 bytes
 .../data/icons/32x32/gnect.png                     |  Bin 2011 -> 2011 bytes
 .../data/icons/48x48/gnect.png                     |  Bin 2968 -> 2968 bytes
 gnect/data/icons/Makefile.am                       |   13 +++++++++++++
 .../data/icons/scalable/gnect.svg                  |    0
 gnect/src/main.c                                   |    6 +++---
 11 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index b0b8751..f036fb7 100644
--- a/configure.in
+++ b/configure.in
@@ -812,6 +812,7 @@ libgames-support/Makefile
 gnect/Makefile
 gnect/src/Makefile
 gnect/data/Makefile
+gnect/data/icons/Makefile
 gnect/pixmaps/Makefile
 gnect/help/Makefile
 gnomine/Makefile
diff --git a/gnect/data/Makefile.am b/gnect/data/Makefile.am
index 9ebdd9b..fb5a4b4 100644
--- a/gnect/data/Makefile.am
+++ b/gnect/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 NULL =
 
 velenadir      = $(pkgdatadir)/gnect
diff --git a/gnect/data/gnect.desktop.in.in b/gnect/data/gnect.desktop.in.in
index 1eb447d..988df88 100644
--- a/gnect/data/gnect.desktop.in.in
+++ b/gnect/data/gnect.desktop.in.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=gnome-gnect
+Icon=gnect
 _Name=Four-in-a-Row
 _Comment=Make lines of the same color to win
 Exec=gnect
diff --git a/icons/hicolor_apps_16x16_gnome-gnect.png b/gnect/data/icons/16x16/gnect.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-gnect.png
rename to gnect/data/icons/16x16/gnect.png
diff --git a/icons/hicolor_apps_22x22_gnome-gnect.png b/gnect/data/icons/22x22/gnect.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-gnect.png
rename to gnect/data/icons/22x22/gnect.png
diff --git a/icons/hicolor_apps_24x24_gnome-gnect.png b/gnect/data/icons/24x24/gnect.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-gnect.png
rename to gnect/data/icons/24x24/gnect.png
diff --git a/icons/hicolor_apps_32x32_gnome-gnect.png b/gnect/data/icons/32x32/gnect.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-gnect.png
rename to gnect/data/icons/32x32/gnect.png
diff --git a/icons/hicolor_apps_48x48_gnome-gnect.png b/gnect/data/icons/48x48/gnect.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-gnect.png
rename to gnect/data/icons/48x48/gnect.png
diff --git a/gnect/data/icons/Makefile.am b/gnect/data/icons/Makefile.am
new file mode 100644
index 0000000..fbea12a
--- /dev/null
+++ b/gnect/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/gnect.png
+icon22_DATA = 22x22/gnect.png
+icon24_DATA = 24x24/gnect.png
+icon32_DATA = 32x32/gnect.png
+icon48_DATA = 48x48/gnect.png
+iconscalable_DATA = scalable/gnect.svg
diff --git a/icons/hicolor_apps_scalable_gnome-gnect.svg b/gnect/data/icons/scalable/gnect.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-gnect.svg
rename to gnect/data/icons/scalable/gnect.svg
diff --git a/gnect/src/main.c b/gnect/src/main.c
index 7c7e03f..cef6e15 100644
--- a/gnect/src/main.c
+++ b/gnect/src/main.c
@@ -739,7 +739,7 @@ on_game_scores (GtkMenuItem * m, gpointer data)
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (scorebox))),
 		      grid, TRUE, TRUE, 0);
 
-  icon = gtk_image_new_from_icon_name ("gnome-gnect", 48);
+  icon = gtk_image_new_from_icon_name ("gnect", 48);
   gtk_container_add (GTK_CONTAINER (grid), icon);
 
   grid2 = gtk_grid_new ();
@@ -816,7 +816,7 @@ on_help_about (GtkAction * action, gpointer data)
 			 "authors", authors, "documenters", documenters,
 			 "artists", artists, "translator-credits",
 			 _("translator-credits"),
-			 "logo-icon-name", "gnome-gnect",
+			 "logo-icon-name", "gnect",
 			 "website", "http://www.gnome.org/projects/gnome-games/";,
 			 "wrap-license", TRUE, NULL);
   g_free (license);
@@ -1264,7 +1264,7 @@ create_app (void)
   g_signal_connect (G_OBJECT (app), "delete_event",
 		    G_CALLBACK (on_game_exit), NULL);
 
-  gtk_window_set_default_icon_name ("gnome-gnect");
+  gtk_window_set_default_icon_name ("gnect");
 
   statusbar = gtk_statusbar_new ();
   ui_manager = gtk_ui_manager_new ();