From 6de3741f18cd513fc3d6b453fa4852c81f40dbcd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 13 Jun 2014 08:40:56 -0400
Subject: [PATCH] Move theme resources into subdirectories

Preparing for Adwaita to come in here.
---
 gtk/gtk.gresource.xml                                 | 10 +++++-----
 gtk/resources/theme/{ => Raleigh}/gtk-default.css     |  0
 gtk/resources/theme/{ => win32}/gtk-win32-base.css    |  0
 gtk/resources/theme/{ => win32}/gtk-win32-classic.css |  0
 gtk/resources/theme/{ => win32}/gtk-win32-xp.css      |  0
 gtk/resources/theme/{ => win32}/gtk-win32.css         |  0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename gtk/resources/theme/{ => Raleigh}/gtk-default.css (100%)
 rename gtk/resources/theme/{ => win32}/gtk-win32-base.css (100%)
 rename gtk/resources/theme/{ => win32}/gtk-win32-classic.css (100%)
 rename gtk/resources/theme/{ => win32}/gtk-win32-xp.css (100%)
 rename gtk/resources/theme/{ => win32}/gtk-win32.css (100%)

diff --git a/gtk/gtk.gresource.xml b/gtk/gtk.gresource.xml
index c41a7fe2d1..3d491d37b0 100644
--- a/gtk/gtk.gresource.xml
+++ b/gtk/gtk.gresource.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gtk/libgtk">
-    <file alias="theme/Raleigh.css">theme/gtk-default.css</file>
-    <file>theme/gtk-win32.css</file>
-    <file>theme/gtk-win32-xp.css</file>
-    <file>theme/gtk-win32-base.css</file>
-    <file>theme/gtk-win32-classic.css</file>
+    <file alias="theme/Raleigh.css">theme/Raleigh/gtk-default.css</file>
+    <file alias="theme/gtk-win32.css">theme/win32/gtk-win32.css</file>
+    <file alias="theme/gtk-win32-xp.css">theme/win32/gtk-win32-xp.css</file>
+    <file alias="theme/gtk-win32-base.css">theme/win32/gtk-win32-base.css</file>
+    <file alias="theme/gtk-win32-classic.css">theme/win32/gtk-win32-classic.css</file>
     <file alias="cursor/dnd-ask.png">cursor/cursor_dnd_ask.png</file>
     <file alias="cursor/dnd-link.png">cursor/cursor_dnd_link.png</file>
     <file alias="cursor/dnd-none.png">cursor/cursor_dnd_none.png</file>
diff --git a/gtk/resources/theme/gtk-default.css b/gtk/resources/theme/Raleigh/gtk-default.css
similarity index 100%
rename from gtk/resources/theme/gtk-default.css
rename to gtk/resources/theme/Raleigh/gtk-default.css
diff --git a/gtk/resources/theme/gtk-win32-base.css b/gtk/resources/theme/win32/gtk-win32-base.css
similarity index 100%
rename from gtk/resources/theme/gtk-win32-base.css
rename to gtk/resources/theme/win32/gtk-win32-base.css
diff --git a/gtk/resources/theme/gtk-win32-classic.css b/gtk/resources/theme/win32/gtk-win32-classic.css
similarity index 100%
rename from gtk/resources/theme/gtk-win32-classic.css
rename to gtk/resources/theme/win32/gtk-win32-classic.css
diff --git a/gtk/resources/theme/gtk-win32-xp.css b/gtk/resources/theme/win32/gtk-win32-xp.css
similarity index 100%
rename from gtk/resources/theme/gtk-win32-xp.css
rename to gtk/resources/theme/win32/gtk-win32-xp.css
diff --git a/gtk/resources/theme/gtk-win32.css b/gtk/resources/theme/win32/gtk-win32.css
similarity index 100%
rename from gtk/resources/theme/gtk-win32.css
rename to gtk/resources/theme/win32/gtk-win32.css