[Xfce4-commits] <gtk-xfce-engine:master> Fix bug 7061

[Olivier Fourdan]

Updating branch refs/heads/master
         to 906b508dc355eff1213baa696bf2306a7d460d6f (commit)
       from b4d9bfb2f8f6ecf3c5ea64042ccec9512555b51d (commit)

commit 906b508dc355eff1213baa696bf2306a7d460d6f
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Jan 5 10:58:30 2011 +0100

    Fix bug 7061
    
    Re-add Xfce 4.6's gtkrc theme as Xfce-4.6

 configure.in.in                             |    2 ++
 themes/Makefile.am                          |    1 +
 themes/xfce-4.6/Makefile.am                 |    3 +++
 themes/{b5 => xfce-4.6}/gtk-2.0/Makefile.am |    2 +-
 themes/{xfce => xfce-4.6}/gtk-2.0/gtkrc     |    2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 4641a49..89680ed 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -90,6 +90,8 @@ themes/xfce-4.2/gtk-2.0/Makefile
 themes/xfce-4.2/Makefile
 themes/xfce-4.4/Makefile
 themes/xfce-4.4/gtk-2.0/Makefile
+themes/xfce-4.6/Makefile
+themes/xfce-4.6/gtk-2.0/Makefile
 themes/basic/gtk-2.0/Makefile
 themes/basic/Makefile
 themes/cadmium/gtk-2.0/Makefile
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 454f2d6..3a15b26 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
 	xfce-4.0	\
 	xfce-4.2	\
 	xfce-4.4	\
+	xfce-4.6	\
 	b5		\
 	basic		\
 	cadmium		\
diff --git a/themes/xfce-4.6/Makefile.am b/themes/xfce-4.6/Makefile.am
new file mode 100644
index 0000000..7b4ab13
--- /dev/null
+++ b/themes/xfce-4.6/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = gtk-2.0
+themedir = $(datadir)/themes/Xfce-4.6
+
diff --git a/themes/b5/gtk-2.0/Makefile.am b/themes/xfce-4.6/gtk-2.0/Makefile.am
similarity index 51%
copy from themes/b5/gtk-2.0/Makefile.am
copy to themes/xfce-4.6/gtk-2.0/Makefile.am
index d303ece..50947b9 100644
--- a/themes/b5/gtk-2.0/Makefile.am
+++ b/themes/xfce-4.6/gtk-2.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-2.0
+themedir = $(datadir)/themes/Xfce-4.6/gtk-2.0
 theme_DATA = gtkrc
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/xfce/gtk-2.0/gtkrc b/themes/xfce-4.6/gtk-2.0/gtkrc
similarity index 99%
copy from themes/xfce/gtk-2.0/gtkrc
copy to themes/xfce-4.6/gtk-2.0/gtkrc
index e533aab..fe39654 100644
--- a/themes/xfce/gtk-2.0/gtkrc
+++ b/themes/xfce-4.6/gtk-2.0/gtkrc
@@ -326,7 +326,7 @@ style "rox" = "default"
 
 style "titlebar" = "default"
 {
-    bg[SELECTED]      = "#1a2738"
+    bg[SELECTED]      = "#5e98e3"
     fg[SELECTED]      = "#ffffff"
     bg[INSENSITIVE]   = "#eeeeec"
     fg[INSENSITIVE]   = "#888a85"