[gnome-themes-standard] Revert "unfocused: initial implementation"

[Cosimo Cecchi <cosimoc src gnome org>]

commit 0b3105196006f60dc9df396f538818a381e17a22
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Nov 21 14:27:25 2011 -0500

    Revert "unfocused: initial implementation"
    
    It's still not good enough and we might change the implementation in
    GTK, so back this out from 3.3.2.
    It will come back in a better shape soon.
    
    This reverts commit cdbeed65da75749665899f182ed81cc494d6ecc7.

 configure.ac                                   |    2 +-
 themes/Adwaita/gtk-3.0/gtk-dark.css            |    1 -
 themes/Adwaita/gtk-3.0/gtk-widgets.css         |   18 ------------------
 themes/Adwaita/gtk-3.0/gtk.css                 |    2 --
 themes/Adwaita/metacity-1/metacity-theme-3.xml |    5 ++---
 5 files changed, 3 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cecf830..8dcb319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
 AM_GLIB_GNU_GETTEXT
 
-GTK_VERSION_REQUIRED=3.3.3
+GTK_VERSION_REQUIRED=3.3.2
 
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0,,
                   AC_MSG_ERROR([GTK+ $GTK_VERSION_REQUIRED is required to compile gnome-themes-standard]))
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 50b8e63..9a2a7a9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -6,7 +6,6 @@
 @define-color theme_fg_color @theme_text_color;
 @define-color theme_selected_bg_color #3465a4;
 @define-color theme_selected_fg_color @theme_text_color;
- define-color theme_unfocused_bg_color #3F4545;
 
 @define-color menu_bg_color #555753;
 @define-color menu_fg_color @theme_text_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 747f251..b04727f 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -50,10 +50,6 @@ GtkWindow {
     color: @theme_fg_color;
 }
 
-GtkWindow:window-unfocused {
-    background-color: @theme_unfocused_bg_color;
-}
-
 * {
     background-color: @theme_bg_color;
 }
@@ -790,10 +786,6 @@ GtkTreeMenu .menuitem * {
     -GtkMenuBar-internal-padding: 0;
 }
 
-.menubar:window-unfocused {
-    background-color: @theme_unfocused_bg_color;
-}
-
 .menubar .menuitem {
     border-width: 0;
     border-style: none;
@@ -937,10 +929,6 @@ GtkTreeMenu .menuitem * {
     padding: 4;
 }
 
-.toolbar:window-unfocused {
-    background-color: @theme_unfocused_bg_color;
-}
-
 .toolbar .button {
     padding: 2;
 }
@@ -990,12 +978,6 @@ GtkTreeMenu .menuitem * {
     -GtkToolbar-button-relief: normal;
 }
 
-.primary-toolbar .toolbar:window-unfocused,
-.primary-toolbar.toolbar:window-unfocused {
-    background-image: none;
-    background-color: @theme_unfocused_bg_color;
-}
-
 .primary-toolbar .toolbar:insensitive,
 .primary-toolbar.toolbar:insensitive {
     background-image: none;
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 8a856c3..87d6252 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -7,7 +7,6 @@
 @define-color fg_color #2e3436;
 @define-color tooltip_fg_color #ffffff;
 @define-color selected_fg_color #ffffff;
- define-color unfocused_bg_color #f8f8f8;
 
 /* Colormap actually used by the theme, to be overridden in other css files */
 @define-color theme_base_color @base_color;
@@ -18,7 +17,6 @@
 @define-color theme_tooltip_fg_color @tooltip_fg_color;
 @define-color theme_selected_bg_color @selected_bg_color;
 @define-color theme_selected_fg_color @selected_fg_color;
- define-color theme_unfocused_bg_color @unfocused_bg_color;
 
 @define-color menu_bg_color shade (@theme_bg_color, 1.1);
 @define-color menu_fg_color @theme_fg_color;
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index 8e223cb..0e285a9 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.xml
@@ -14,10 +14,10 @@
 <constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
 <constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
 <constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="gtk:bg[WINDOW-UNFOCUSED]" />
+<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
 <constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
 <constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.5" />
+<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
 <!-- color of the button icons -->
 <constant name="C_icons_focused" value="gtk:text[SELECTED]" />
 <constant name="C_icons_focused_pressed" value="#ffffff" />
@@ -1627,7 +1627,6 @@
 
 <frame_style name="attached_unfocused" geometry="attached">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
 	<piece position="overlay" draw_ops="border_unfocused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
 	<button function="close" state="pressed"><draw_ops></draw_ops></button>