From b3d1121d785e0ff4f5b88438f2c0c2df41c6789e Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 1 Feb 2013 19:02:56 +0100
Subject: [PATCH] gtk-demo: Move resources into the tests they belong

This also gets rid of the nasty @import("resource:///...") lines in the
css files.
---
 demos/gtk-demo/css_accordion.css   |  2 +-
 demos/gtk-demo/css_basics.css      |  2 +-
 demos/gtk-demo/css_multiplebgs.css |  4 ++--
 demos/gtk-demo/css_pixbufs.css     | 22 +++++++++++-----------
 demos/gtk-demo/css_shadows.css     |  4 ++--
 demos/gtk-demo/demo.gresource.xml  | 10 ++++++++--
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/demos/gtk-demo/css_accordion.css b/demos/gtk-demo/css_accordion.css
index df01971f19..b1d27ad093 100644
--- a/demos/gtk-demo/css_accordion.css
+++ b/demos/gtk-demo/css_accordion.css
@@ -1,4 +1,4 @@
-@import url("resource:///reset.css");
+@import url("reset.css");
 
 * {
     transition-property: color, background-color, border-color, background-image, padding, border-width;
diff --git a/demos/gtk-demo/css_basics.css b/demos/gtk-demo/css_basics.css
index 793512daa9..bd6a6944b9 100644
--- a/demos/gtk-demo/css_basics.css
+++ b/demos/gtk-demo/css_basics.css
@@ -6,7 +6,7 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
+@import url("reset.css");
 
 /* Set a very futuristic style by default */
 * {
diff --git a/demos/gtk-demo/css_multiplebgs.css b/demos/gtk-demo/css_multiplebgs.css
index 36c1f8c441..41089c3ef7 100644
--- a/demos/gtk-demo/css_multiplebgs.css
+++ b/demos/gtk-demo/css_multiplebgs.css
@@ -6,8 +6,8 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
-@import url("resource:///cssview.css");
+@import url("reset.css");
+@import url("cssview.css");
 
 #canvas {
     transition-property: background-color, background-image;
diff --git a/demos/gtk-demo/css_pixbufs.css b/demos/gtk-demo/css_pixbufs.css
index 8eb21d664f..01762565a5 100644
--- a/demos/gtk-demo/css_pixbufs.css
+++ b/demos/gtk-demo/css_pixbufs.css
@@ -6,8 +6,8 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
-@import url("resource:///cssview.css");
+@import url("reset.css");
+@import url("cssview.css");
 
 @keyframes move-the-image {
 0% { background-position: 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 0% 0%; }
@@ -51,15 +51,15 @@
 }
 
 GtkWindow {
-    background-image: url("resource:///css_pixbufs/apple-red.png"),
-                      url("resource:///css_pixbufs/gnome-applets.png"),
-                      url("resource:///css_pixbufs/gnome-calendar.png"),
-                      url("resource:///css_pixbufs/gnome-foot.png"),
-                      url("resource:///css_pixbufs/gnome-gmush.png"),
-                      url("resource:///css_pixbufs/gnome-gimp.png"),
-                      url("resource:///css_pixbufs/gnome-gsame.png"),
-                      url("resource:///css_pixbufs/gnu-keys.png"),
-                      url("resource:///css_pixbufs/background.jpg");
+    background-image: url("apple-red.png"),
+                      url("gnome-applets.png"),
+                      url("gnome-calendar.png"),
+                      url("gnome-foot.png"),
+                      url("gnome-gmush.png"),
+                      url("gnome-gimp.png"),
+                      url("gnome-gsame.png"),
+                      url("gnu-keys.png"),
+                      url("background.jpg");
     background-position: 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 0% 0%;
     background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, repeat;
     animation: move-the-image infinite linear 3s, size-the-image infinite alternate ease-in-out 0.75s;
diff --git a/demos/gtk-demo/css_shadows.css b/demos/gtk-demo/css_shadows.css
index 5fcacfdf0d..b38e229c0c 100644
--- a/demos/gtk-demo/css_shadows.css
+++ b/demos/gtk-demo/css_shadows.css
@@ -6,8 +6,8 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
-@import url("resource:///cssview.css");
+@import url("reset.css");
+@import url("cssview.css");
 
 /* Get a nice background for the window */
 .background {
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index f1c19b84ab..7e60c3553a 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/">
-    <file>cssview.css</file>
     <file>gtk-logo-rgb.gif</file>
-    <file>reset.css</file>
   </gresource>
   <gresource prefix="/application">
     <file preprocess="to-pixdata">gtk-logo-24.png</file>
@@ -19,19 +17,25 @@
   </gresource>
   <gresource prefix="/css_accordion">
     <file>css_accordion.css</file>
+    <file>reset.css</file>
   </gresource>
   <gresource prefix="/css_basics">
     <file>css_basics.css</file>
+    <file>reset.css</file>
   </gresource>
   <gresource prefix="/css_multiplebgs">
     <file>css_multiplebgs.css</file>
     <file>brick.png</file>
+    <file>cssview.css</file>
+    <file>reset.css</file>
   </gresource>
   <gresource prefix="/theming_style_classes">
     <file preprocess="xml-stripblanks">theming.ui</file>
   </gresource>
   <gresource prefix="/css_pixbufs">
     <file alias="gtk.css">css_pixbufs.css</file>
+    <file>cssview.css</file>
+    <file>reset.css</file>
     <file>background.jpg</file>
     <file>apple-red.png</file>
     <file>gnome-applets.png</file>
@@ -44,6 +48,8 @@
   </gresource>
   <gresource prefix="/css_shadows">
     <file alias="gtk.css">css_shadows.css</file>
+    <file>cssview.css</file>
+    <file>reset.css</file>
   </gresource>
   <gresource prefix="/iconview">
     <file preprocess="to-pixdata">gnome-fs-directory.png</file>