From db214bbd1ba7adb4f7e0be165153900e68ed5af7 Mon Sep 17 00:00:00 2001
From: Daniel Boles <dboles@src.gnome.org>
Date: Wed, 18 Jan 2017 21:20:10 +0000
Subject: [PATCH] combobox: Move variables into narrowest scopes

---
 gtk/gtkcombobox.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 911046bc90..268653abf8 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2304,15 +2304,15 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box,
                           guint32      activate_time)
 {
   GtkComboBoxPrivate *priv = combo_box->priv;
-  GtkTreePath *path;
   gint active_item;
-  gint width, min_width, nat_width;
 
   update_menu_sensitivity (combo_box, priv->popup_widget);
 
   active_item = -1;
   if (gtk_tree_row_reference_valid (priv->active_row))
     {
+      GtkTreePath *path;
+
       path = gtk_tree_row_reference_get_path (priv->active_row);
       active_item = gtk_tree_path_get_indices (path)[0];
       gtk_tree_path_free (path);
@@ -2327,6 +2327,7 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box,
   if (priv->wrap_width == 0)
     {
       GtkAllocation content_allocation;
+      gint width, min_width, nat_width;
 
       gtk_css_gadget_get_content_allocation (priv->gadget, &content_allocation, NULL);
       width = content_allocation.width;