From c72d094ae0b7745239bda7f49d30556d1c53a973 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 26 Oct 2015 21:32:26 -0400
Subject: [PATCH] entry: Use better element name for progress

Change the name of the CSS subnode for progress rendering from
progressbar to progress. This will align better with GtkProgressBar.
---
 gtk/gtkentry.c                           | 4 ++--
 gtk/theme/Adwaita/_common.scss           | 2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
 gtk/theme/Adwaita/gtk-contained.css      | 4 ++--
 gtk/theme/HighContrast/_common.scss      | 2 +-
 gtk/theme/HighContrast/gtk.css           | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 206b42f926..224c875504 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -123,7 +123,7 @@
  * When the entry shows icons, it adds subnodes with the name image and the
  * style class .left or .right, depending on where the icon appears.
  *
- * When the entry shows progress, it adds a subnode with the name progressbar.
+ * When the entry shows progress, it adds a subnode with the name progress.
  * The node has the style class .pulse when the shown progress is pulsing.
  */
 
@@ -10673,7 +10673,7 @@ gtk_entry_ensure_progress_node (GtkEntry *entry)
 
   widget_node = gtk_widget_get_css_node (GTK_WIDGET (entry));
   priv->progress_node = gtk_css_node_new ();
-  gtk_css_node_set_name (priv->progress_node, I_("progressbar"));
+  gtk_css_node_set_name (priv->progress_node, I_("progress"));
   gtk_css_node_set_parent (priv->progress_node, widget_node);
   gtk_css_node_set_state (priv->progress_node, gtk_css_node_get_state (widget_node));
   g_object_unref (priv->progress_node);
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c585f8b72a..2a512025e7 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -249,7 +249,7 @@ entry {
     @extend %selected_items;
   }
 
-  & progressbar {
+  & progress {
     margin: 1px;
     border-radius: 0;
     border-width: 0 0 2px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d001462219..849c5f57c7 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -203,7 +203,7 @@ entry {
     border-color: #1f2222;
     background-image: linear-gradient(to bottom, #333636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
-  entry progressbar {
+  entry progress {
     margin: 1px;
     border-radius: 0;
     border-width: 0 0 2px;
@@ -212,7 +212,7 @@ entry {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-    entry progressbar:backdrop {
+    entry progress:backdrop {
       background-color: transparent; }
   .linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + .button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
     border-left-color: #0f2b48; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index a1e95059e3..f515b3c02e 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -203,7 +203,7 @@ entry {
     border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
-  entry progressbar {
+  entry progress {
     margin: 1px;
     border-radius: 0;
     border-width: 0 0 2px;
@@ -212,7 +212,7 @@ entry {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-    entry progressbar:backdrop {
+    entry progress:backdrop {
       background-color: transparent; }
   .linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + .button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
     border-left-color: #4a90d9; }
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 86f8fc80bb..e6eaa1ee23 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -206,7 +206,7 @@ entry {
   &:selected:focus {
     @extend %selected_items;
   }
-  & progressbar {
+  & progress {
     margin: 1px;
     border-radius: 0;
     border-width: 0 0 2px;
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index fdb4b954c9..ccc171890c 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -246,7 +246,7 @@ entry {
   entry:selected, entry:backdrop:selected {
     background-color: #000;
     color: #fff; }
-  entry progressbar {
+  entry progress {
     margin: 1px;
     border-radius: 0;
     border-width: 0 0 2px;
@@ -255,7 +255,7 @@ entry {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-    entry progressbar:backdrop {
+    entry progress:backdrop {
       background-color: transparent; }
   .linked entry:first-child {
     border-top-right-radius: 0;