GNOME.org
 

[gnome-games] glchess, glines: Move icons into <game>/data/ directories

commit 79d2aa54c2290ba142cb41255c2a548d8bb64340
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 15:31:53 2011 +1100

    glchess, glines: Move icons into <game>/data/ directories

 configure.in                                       |    2 +
 glchess/data/Makefile.am                           |    2 +-
 .../data/icons/16x16/glchess.png                   |  Bin 568 -> 568 bytes
 .../data/icons/22x22/glchess.png                   |  Bin 986 -> 986 bytes
 .../data/icons/24x24/glchess.png                   |  Bin 1027 -> 1027 bytes
 .../data/icons/32x32/glchess.png                   |  Bin 1354 -> 1354 bytes
 .../data/icons/48x48/glchess.png                   |  Bin 2177 -> 2177 bytes
 .../data/icons/scalable/glchess.svg                |    0
 glchess/glchess.desktop.in.in                      |    2 +-
 glchess/src/glchess.vala                           |    2 +-
 glines/data/Makefile.am                            |    2 +
 glines/data/glines.desktop.in.in                   |    2 +-
 glines/data/glines.ui                              |    2 +-
 .../data/icons/16x16/glines.png                    |  Bin 675 -> 675 bytes
 .../data/icons/22x22/glines.png                    |  Bin 1161 -> 1161 bytes
 .../data/icons/24x24/glines.png                    |  Bin 1228 -> 1228 bytes
 .../data/icons/32x32/glines.png                    |  Bin 1908 -> 1908 bytes
 .../data/icons/48x48/glines.png                    |  Bin 3326 -> 3326 bytes
 .../data/icons/scalable/glines.svg                 |    0
 glines/src/glines.c                                |    4 +-
 icons/Makefile.am                                  |   22 --------------------
 21 files changed, 11 insertions(+), 29 deletions(-)
---
diff --git a/configure.in b/configure.in
index 8d0d9d3..c5c067e 100644
--- a/configure.in
+++ b/configure.in
@@ -844,6 +844,7 @@ gnotski/src/Makefile
 gnotski/help/Makefile
 glines/Makefile
 glines/data/Makefile
+glines/data/icons/Makefile
 glines/src/Makefile
 glines/help/Makefile
 lightsoff/Makefile
@@ -866,6 +867,7 @@ gnibbles/help/Makefile
 gnibbles/src/Makefile
 glchess/Makefile
 glchess/data/Makefile
+glchess/data/icons/Makefile
 glchess/data/pieces/Makefile
 glchess/data/pieces/3d/Makefile
 glchess/data/pieces/fancy/Makefile
diff --git a/glchess/data/Makefile.am b/glchess/data/Makefile.am
index d09a684..80fa686 100644
--- a/glchess/data/Makefile.am
+++ b/glchess/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = pieces textures
+SUBDIRS = icons pieces textures
 
 uidir = $(datadir)/glchess
 ui_DATA = \
diff --git a/icons/hicolor_apps_16x16_gnome-glchess.png b/glchess/data/icons/16x16/glchess.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-glchess.png
rename to glchess/data/icons/16x16/glchess.png
diff --git a/icons/hicolor_apps_22x22_gnome-glchess.png b/glchess/data/icons/22x22/glchess.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-glchess.png
rename to glchess/data/icons/22x22/glchess.png
diff --git a/icons/hicolor_apps_24x24_gnome-glchess.png b/glchess/data/icons/24x24/glchess.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-glchess.png
rename to glchess/data/icons/24x24/glchess.png
diff --git a/icons/hicolor_apps_32x32_gnome-glchess.png b/glchess/data/icons/32x32/glchess.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-glchess.png
rename to glchess/data/icons/32x32/glchess.png
diff --git a/icons/hicolor_apps_48x48_gnome-glchess.png b/glchess/data/icons/48x48/glchess.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-glchess.png
rename to glchess/data/icons/48x48/glchess.png
diff --git a/icons/hicolor_apps_scalable_gnome-glchess.svg b/glchess/data/icons/scalable/glchess.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-glchess.svg
rename to glchess/data/icons/scalable/glchess.svg
diff --git a/glchess/glchess.desktop.in.in b/glchess/glchess.desktop.in.in
index 471f97c..a4d868a 100644
--- a/glchess/glchess.desktop.in.in
+++ b/glchess/glchess.desktop.in.in
@@ -7,7 +7,7 @@ Terminal=false
 Type=Application
 Categories=GNOME;Game;BoardGame;
 StartupNotify=true
-Icon=gnome-glchess
+Icon=glchess
 MimeType=application/x-chess-pgn;
 GenericName=3D Chess Game
 X-GNOME-Bugzilla-Bugzilla=GNOME
diff --git a/glchess/src/glchess.vala b/glchess/src/glchess.vala
index d6c16bb..5eb6fdf 100644
--- a/glchess/src/glchess.vala
+++ b/glchess/src/glchess.vala
@@ -1375,7 +1375,7 @@ public class Application : Gtk.Application
         about_dialog.translator_credits = "translator-credits";
         about_dialog.website = "http://www.gnome.org/projects/gnome-games/";;
         about_dialog.website_label = _("GNOME Games web site");
-        about_dialog.logo_icon_name = "gnome-glchess";
+        about_dialog.logo_icon_name = "glchess";
         about_dialog.response.connect (about_response_cb);
         about_dialog.show ();
     }
diff --git a/glines/data/Makefile.am b/glines/data/Makefile.am
index bf1837c..96ef9db 100644
--- a/glines/data/Makefile.am
+++ b/glines/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 uidir = $(pkgdatadir)/glines/
 ui_DATA = \
 	glines.ui \
diff --git a/glines/data/glines.desktop.in.in b/glines/data/glines.desktop.in.in
index d05b1fd..dab55a4 100644
--- a/glines/data/glines.desktop.in.in
+++ b/glines/data/glines.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Five or More
 _Comment=Remove colored balls from the board by forming lines
 Exec=glines
-Icon=gnome-glines
+Icon=glines
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
diff --git a/glines/data/glines.ui b/glines/data/glines.ui
index c87e5b1..b993167 100644
--- a/glines/data/glines.ui
+++ b/glines/data/glines.ui
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Five or more</property>
     <property name="default_width">320</property>
     <property name="default_height">400</property>
-    <property name="icon_name">gnome-glines</property>
+    <property name="icon_name">glines</property>
     <accel-groups>
       <group name="accelgroup"/>
     </accel-groups>
diff --git a/icons/hicolor_apps_16x16_gnome-glines.png b/glines/data/icons/16x16/glines.png
similarity index 100%
rename from icons/hicolor_apps_16x16_gnome-glines.png
rename to glines/data/icons/16x16/glines.png
diff --git a/icons/hicolor_apps_22x22_gnome-glines.png b/glines/data/icons/22x22/glines.png
similarity index 100%
rename from icons/hicolor_apps_22x22_gnome-glines.png
rename to glines/data/icons/22x22/glines.png
diff --git a/icons/hicolor_apps_24x24_gnome-glines.png b/glines/data/icons/24x24/glines.png
similarity index 100%
rename from icons/hicolor_apps_24x24_gnome-glines.png
rename to glines/data/icons/24x24/glines.png
diff --git a/icons/hicolor_apps_32x32_gnome-glines.png b/glines/data/icons/32x32/glines.png
similarity index 100%
rename from icons/hicolor_apps_32x32_gnome-glines.png
rename to glines/data/icons/32x32/glines.png
diff --git a/icons/hicolor_apps_48x48_gnome-glines.png b/glines/data/icons/48x48/glines.png
similarity index 100%
rename from icons/hicolor_apps_48x48_gnome-glines.png
rename to glines/data/icons/48x48/glines.png
diff --git a/icons/hicolor_apps_scalable_gnome-glines.svg b/glines/data/icons/scalable/glines.svg
similarity index 100%
rename from icons/hicolor_apps_scalable_gnome-glines.svg
rename to glines/data/icons/scalable/glines.svg
diff --git a/glines/src/glines.c b/glines/src/glines.c
index 89a4091..40fed16 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -1185,7 +1185,7 @@ game_about_callback (GtkAction * action, gpointer * data)
                          "authors", authors,
                          "documenters", documenters,
                          "translator-credits", _("translator-credits"),
-                         "logo-icon-name", "gnome-glines",
+                         "logo-icon-name", "glines",
                          "website", "http://www.gnome.org/projects/gnome-games/";,
                          "website-label", _("GNOME Games web site"),
                          "wrap-license", TRUE, NULL);
@@ -1625,7 +1625,7 @@ main (int argc, char *argv[])
 
   games_stock_init ();
 
-  gtk_window_set_default_icon_name ("gnome-glines");
+  gtk_window_set_default_icon_name ("glines");
 
 #ifdef WITH_SMCLIENT
   sm_client = egg_sm_client_get ();
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 14abf03..c67e7f2 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -4,28 +4,6 @@ public_icons_themes = hicolor
 
 dist_noinst_DATA =
 
-if BUILD_GLCHESS
-dist_noinst_DATA += \
-	hicolor_apps_16x16_gnome-glchess.png \
-	hicolor_apps_22x22_gnome-glchess.png \
-	hicolor_apps_24x24_gnome-glchess.png \
-	hicolor_apps_32x32_gnome-glchess.png \
-	hicolor_apps_48x48_gnome-glchess.png \
-	hicolor_apps_scalable_gnome-glchess.svg \
-	$(NULL)
-endif
-
-if BUILD_GLINES
-dist_noinst_DATA += \
-	hicolor_apps_16x16_gnome-glines.png \
-	hicolor_apps_22x22_gnome-glines.png \
-	hicolor_apps_24x24_gnome-glines.png \
-	hicolor_apps_32x32_gnome-glines.png \
-	hicolor_apps_48x48_gnome-glines.png \
-	hicolor_apps_scalable_gnome-glines.svg \
-	$(NULL)
-endif
-
 if BUILD_GNECT
 dist_noinst_DATA += \
 	hicolor_apps_16x16_gnome-gnect.png \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]