[gnome-themes-standard] adwaita: remove our custom gtk_render_line() implementation

[Cosimo Cecchi <cosimoc src gnome org>]

commit 4eb5e8e3bcc24e7c9cfb15cf832557c125f6513e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Sep 1 14:12:10 2011 -0400

    adwaita: remove our custom gtk_render_line() implementation
    
    Use the stock GtkThemingEngine one now that it's fixed.

 src/adwaita_engine.c                   |   45 --------------------------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css |   31 ++++++++++------------
 2 files changed, 14 insertions(+), 62 deletions(-)
---
diff --git a/src/adwaita_engine.c b/src/adwaita_engine.c
index a8d45ea..296d106 100644
--- a/src/adwaita_engine.c
+++ b/src/adwaita_engine.c
@@ -800,50 +800,6 @@ adwaita_engine_render_handle (GtkThemingEngine *engine,
 }
 
 static void
-adwaita_engine_render_line (GtkThemingEngine *engine,
-                            cairo_t *cr,
-                            gdouble x0,
-                            gdouble y0,
-                            gdouble x1,
-                            gdouble y1)
-{
-  const GtkWidgetPath *path;
-
-  path = gtk_theming_engine_get_path (engine);
-
-  if ((gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_MARK) &&
-       gtk_widget_path_is_type (path, GTK_TYPE_SCALE)) ||
-      (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SEPARATOR) &&
-       gtk_widget_path_is_type (path, GTK_TYPE_TREE_VIEW)))
-    {
-      GtkStateFlags state;
-      GdkRGBA bg;
-
-      state = gtk_theming_engine_get_state (engine);
-      gtk_theming_engine_get_background_color (engine, state, &bg);
-
-      cairo_save (cr);
-
-      cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
-      cairo_set_line_width (cr, 1);
-
-      cairo_move_to (cr, x0 + 0.5, y0 + 0.5);
-      cairo_line_to (cr, x1 + 0.5, y1 + 0.5);
-
-      gdk_cairo_set_source_rgba (cr, &bg);
-      cairo_stroke (cr);
-
-      cairo_restore (cr);
-    }
-  else
-    {
-      GTK_THEMING_ENGINE_CLASS (adwaita_engine_parent_class)->render_line
-        (engine, cr,
-         x0, y0, x1, y1);
-    }
-}
-
-static void
 adwaita_engine_class_init (AdwaitaEngineClass *klass)
 {
   GtkThemingEngineClass *engine_class = GTK_THEMING_ENGINE_CLASS (klass);
@@ -859,7 +815,6 @@ adwaita_engine_class_init (AdwaitaEngineClass *klass)
   engine_class->render_activity = adwaita_engine_render_activity;
   engine_class->render_slider = adwaita_engine_render_slider;
   engine_class->render_handle = adwaita_engine_render_handle;
-  engine_class->render_line = adwaita_engine_render_line;
 
   gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
                                         g_param_spec_boxed ("focus-border-color",
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 0de6a0f..f668bc8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -32,8 +32,6 @@
     -GtkIMHtml-hyperlink-color: @link_color;
     -GtkHTML-link-color: @link_color;
 
-    -GtkWidget-wide-separators: 1;
-
     -WnckTasklist-fade-overlay-rect: 0;
 
     -GtkWidget-focus-padding: 2;
@@ -105,6 +103,10 @@ GtkWindow {
     border-radius: 2;
 }
 
+.separator {
+    color: darker (@theme_bg_color);
+}
+
 .pane-separator {
     color: shade (@inactive_frame_color, 0.80);
 }
@@ -345,7 +347,7 @@ GtkScale.progressbar {
 }
 
 GtkScale.mark {
-    background-color: shade (@theme_bg_color, 0.56);
+    color: shade (@theme_bg_color, 0.56);
 }
 
 /**********
@@ -501,6 +503,13 @@ GtkComboBox {
     -GtkComboBox-shadow-type: none;
 }
 
+GtkComboBox .separator {
+    /* always disable separators */
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0;
+}
+
 GtkComboBox .entry {
     border-width: 1 0 1 1;
     border-radius: 3 0 0 3;
@@ -729,12 +738,9 @@ GtkTreeMenu .menuitem * {
 }
 
 .menuitem.separator {
-    border-color: @menu_separator;
-    border-style: solid;
-    border-width: 1;
+    color: @menu_separator;
 
     -GtkSeparatorMenuItem-horizontal-padding: 0;
-    -GtkWidget-separator-height: 1;
 }
 
 .menuitem.check,
@@ -942,12 +948,7 @@ GtkTreeMenu .menuitem * {
 
 .primary-toolbar .toolbar GtkSeparatorToolItem,
 .primary-toolbar.toolbar GtkSeparatorToolItem {
-    -GtkWidget-wide-separators: 1;
-    -GtkWidget-separator-width: 1;
-
-    border-style: solid;
-    border-width: 1;
-    border-color: shade (@theme_bg_color, 0.56);
+    color: shade (@theme_bg_color, 0.56);
 }
 
 /* primary toolbar raised buttons */
@@ -1276,10 +1277,6 @@ GtkTreeView {
     -adwaita-focus-border-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
 }
 
-GtkTreeView.separator {
-    background-color: darker (@theme_bg_color);
-}
-
 column-header {
     padding: 1 2;
 }