From 5f6db9a18267c0ada85d3910d7d00e1fbc4a830d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 19 Jul 2015 18:31:33 +0200
Subject: [PATCH] combobox: Remove autoscroll timer on popdown

---
 gtk/gtkcombobox.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 773e5409b4..a81b341dd6 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2502,6 +2502,12 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button),
                                 FALSE);
 
+  if (priv->scroll_timer)
+    {
+      g_source_remove (priv->scroll_timer);
+      priv->scroll_timer = 0;
+    }
+
   priv->grab_pointer = NULL;
   priv->grab_keyboard = NULL;
 }