From ed8641ff26a2f83b5b3dd449d4e20dad34251dee Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 26 Oct 2015 15:28:50 -0400
Subject: [PATCH] entry: Only set one of the .left, .right style classes

We were not removing the old style class when adding a new one.
---
 gtk/gtkentry.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 75e0131ec1..206b42f926 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3169,25 +3169,16 @@ update_icon_style (GtkWidget            *widget,
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkEntryPrivate *priv = entry->priv;
   EntryIconInfo *icon_info = priv->icons[icon_pos];
-  const gchar *side;
+  const gchar *sides[2] = { GTK_STYLE_CLASS_LEFT, GTK_STYLE_CLASS_RIGHT };
 
   if (icon_info == NULL)
     return;
 
   if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-    {
-      side = icon_pos == GTK_ENTRY_ICON_PRIMARY
-             ? GTK_STYLE_CLASS_RIGHT
-             : GTK_STYLE_CLASS_LEFT;
-    }
-  else
-    {
-      side = icon_pos == GTK_ENTRY_ICON_PRIMARY
-             ? GTK_STYLE_CLASS_LEFT
-             : GTK_STYLE_CLASS_RIGHT;
-    }
+    icon_pos = 1 - icon_pos;
 
-  gtk_css_node_add_class (icon_info->css_node, g_quark_from_static_string (side));
+  gtk_css_node_add_class (icon_info->css_node, g_quark_from_static_string (sides[icon_pos]));
+  gtk_css_node_remove_class (icon_info->css_node, g_quark_from_static_string (sides[1 - icon_pos]));
 }
 
 static EntryIconInfo*