From 277dd7106ac5141b0cdecd492183e1bd0a4d5819 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Fri, 18 Sep 2009 16:29:28 -0400
Subject: [PATCH] Fix installation and distribution of stylesheet data

Install and distribute gnome-shell.css and theme images. They are moved
down from $datadir to $datadir/theme to avoid a weirdness where we have
images in $datadir and then also in $datadir/images.

(Also moved in the source tree to avoid adding another difference between
installed and uninstalled operation.)
---
 data/Makefile.am                              |  28 +++++++++++-------
 data/{ => theme}/gnome-shell.css              |   0
 data/{ => theme}/scroll-button-down-hover.png | Bin
 data/{ => theme}/scroll-button-down.png       | Bin
 data/{ => theme}/scroll-button-up-hover.png   | Bin
 data/{ => theme}/scroll-button-up.png         | Bin
 data/{ => theme}/scroll-vhandle.png           | Bin
 js/ui/main.js                                 |   2 +-
 tests/testcommon/test.css                     |   2 +-
 9 files changed, 20 insertions(+), 12 deletions(-)
 rename data/{ => theme}/gnome-shell.css (100%)
 rename data/{ => theme}/scroll-button-down-hover.png (100%)
 rename data/{ => theme}/scroll-button-down.png (100%)
 rename data/{ => theme}/scroll-button-up-hover.png (100%)
 rename data/{ => theme}/scroll-button-up.png (100%)
 rename data/{ => theme}/scroll-vhandle.png (100%)

diff --git a/data/Makefile.am b/data/Makefile.am
index 50270a374..06827d0b3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,18 +12,26 @@ gnome-shell.desktop.in: gnome-shell.desktop.in.in
 gnome-shell.desktop: gnome-shell.desktop.in
 	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
 
-imagedir = $(pkgdatadir)/images
-
-dist_image_DATA =		\
-	add-workspace.svg	\
-	app-well-glow.png	\
-        back.svg                \
-	close.svg		\
-	close-black.svg       \
-	info.svg		\
-	magnifier.svg  \
+imagesdir = $(pkgdatadir)/images
+dist_images_DATA =				\
+	add-workspace.svg			\
+	app-well-glow.png			\
+	back.svg				\
+	close.svg				\
+	close-black.svg				\
+	info.svg				\
+	magnifier.svg				\
 	remove-workspace.svg
 
+themedir = $(pkgdatadir)/theme
+dist_theme_DATA =				\
+	theme/gnome-shell.css			\
+	theme/scroll-button-down.png		\
+	theme/scroll-button-down-hover.png	\
+	theme/scroll-button-up.png		\
+	theme/scroll-button-up-hover.png	\
+	theme/scroll-vhandle.png
+
 schemadir  = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = gnome-shell.schemas
 
diff --git a/data/gnome-shell.css b/data/theme/gnome-shell.css
similarity index 100%
rename from data/gnome-shell.css
rename to data/theme/gnome-shell.css
diff --git a/data/scroll-button-down-hover.png b/data/theme/scroll-button-down-hover.png
similarity index 100%
rename from data/scroll-button-down-hover.png
rename to data/theme/scroll-button-down-hover.png
diff --git a/data/scroll-button-down.png b/data/theme/scroll-button-down.png
similarity index 100%
rename from data/scroll-button-down.png
rename to data/theme/scroll-button-down.png
diff --git a/data/scroll-button-up-hover.png b/data/theme/scroll-button-up-hover.png
similarity index 100%
rename from data/scroll-button-up-hover.png
rename to data/theme/scroll-button-up-hover.png
diff --git a/data/scroll-button-up.png b/data/theme/scroll-button-up.png
similarity index 100%
rename from data/scroll-button-up.png
rename to data/theme/scroll-button-up.png
diff --git a/data/scroll-vhandle.png b/data/theme/scroll-vhandle.png
similarity index 100%
rename from data/scroll-vhandle.png
rename to data/theme/scroll-vhandle.png
diff --git a/js/ui/main.js b/js/ui/main.js
index ed85e3d0b..56dfeff4c 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -68,7 +68,7 @@ function start() {
         children[i].destroy();
 
     let style = Nbtk.Style.get_default();
-    let stylesheetPath = global.datadir + "/gnome-shell.css";
+    let stylesheetPath = global.datadir + "/theme/gnome-shell.css";
     style.load_from_file(stylesheetPath);
 
     global.connect('panel-run-dialog', function(panel) {
diff --git a/tests/testcommon/test.css b/tests/testcommon/test.css
index f81679117..0e1b3ace7 100644
--- a/tests/testcommon/test.css
+++ b/tests/testcommon/test.css
@@ -1,4 +1,4 @@
-@import "../../data/gnome-shell.css";
+@import "../../data/theme/gnome-shell.css";
 
 *.red {
     background-color: red;