[aisleriot] sol: Add resource for the baize

[Christian Persch <chpe src gnome org>]

commit dac32723eb5808ed706d270996c10e50d40cea0b
Author: Christian Persch <chpe gnome org>
Date:   Wed Jan 18 21:37:17 2012 +0100

    sol: Add resource for the baize
    
    ... and use it to set the background.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666667

 data/Makefile.am               |    5 ++++-
 {src => data}/baize.png        |  Bin 428 -> 428 bytes
 src/Makefile.am                |    4 ----
 src/aisleriot.gresource.xml.in |    1 +
 src/ar-style-gtk.c             |    6 ++----
 5 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index bd2d8fc..2d25176 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,10 @@ if ENABLE_SOUND
 SUBDIRS += sounds
 endif
 
-dist_noinst_DATA = slot.svg
+dist_noinst_DATA = \
+	baize.png \
+	slot.svg \
+	$(NULL)
 
 pkcatalogdir = $(pkgdatadir)
 pkcatalog_DATA = aisleriot.catalog
diff --git a/src/baize.png b/data/baize.png
similarity index 100%
rename from src/baize.png
rename to data/baize.png
diff --git a/src/Makefile.am b/src/Makefile.am
index 5fec7e9..3a4e616 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,10 +5,6 @@ NULL =
 # Same as in help/Makefile.am
 DOC_MODULE = aisleriot
 
-cardimagedir = $(pkgdatadir)/pixmaps
-cardimage_DATA = \
-	baize.png
-
 bin_PROGRAMS = sol
 
 sol_SOURCES = \
diff --git a/src/aisleriot.gresource.xml.in b/src/aisleriot.gresource.xml.in
index 041f588..327ed0e 100644
--- a/src/aisleriot.gresource.xml.in
+++ b/src/aisleriot.gresource.xml.in
@@ -18,5 +18,6 @@
 <gresources>
   <gresource prefix="/org/gnome/aisleriot">
     <file alias="art/slot.svg" compressed="true" preprocess="xml-stripblanks">@top_srcdir@/data/slot.svg</file>
+    <file alias="art/baize.png">@top_srcdir@/data/baize.png</file>
   </gresource>
 </gresources>
diff --git a/src/ar-style-gtk.c b/src/ar-style-gtk.c
index 80fdcca..36b2b05 100644
--- a/src/ar-style-gtk.c
+++ b/src/ar-style-gtk.c
@@ -53,11 +53,9 @@ ar_style_provider_new (void)
     "" NAME "{\n"
       "background-color: " DEFAULT_BACKGROUND_COLOR_STRING ";\n"
       "-" NAME "-selection-color: " DEFAULT_SELECTION_COLOR_STRING ";\n"
+      "background-image: url('resource:///org/gnome/aisleriot/art/baize.png');\n"
+      "background-repeat: repeat;\n"
   "}\n";
-#if 0
-    "background-image: url('baize.png');\n"
-    "background-repeat: repeat;\n"
-#endif
 #undef NAME
 
   GtkCssProvider *provider;