From 066f3be659c664f0a5356c478ddf1437c4d8a501 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 6 Jan 2012 20:33:00 +0100
Subject: [PATCH] themingengine: Remove an optimization

We optimize the case later on, so no need to do it here.
---
 gtk/gtkthemingengine.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 754fe8c432..f448d45445 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -1543,7 +1543,6 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
                                  gdouble           height)
 {
   GtkStateFlags flags;
-  GtkBorderStyle border_style;
   GtkJunctionSides junction;
   GtkBorderImage border_image;
   GtkBorder border;
@@ -1552,14 +1551,10 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
   junction = gtk_theming_engine_get_junction_sides (engine);
   gtk_theming_engine_get_border (engine, flags, &border);
 
-  gtk_theming_engine_get (engine, flags,
-			  "border-style", &border_style,
-			  NULL);
-
   if (_gtk_border_image_init (&border_image, engine))
     _gtk_border_image_render (&border_image, &border,
                               cr, x, y, width, height);
-  else if (border_style != GTK_BORDER_STYLE_NONE)
+  else
     render_frame_internal (engine, cr,
                            x, y, width, height,
                            0, junction);