summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-07-19 18:31:33 +0200
committerBenjamin Otte <otte@redhat.com>2015-07-21 02:28:53 +0200
commit5f6db9a18267c0ada85d3910d7d00e1fbc4a830d (patch)
tree6bf585c29da2dd0926b720029438b75e987d7ad2 /gtk
parent19726a5a0eed18c85a1529b2e3d064b4c776f5ae (diff)
downloadgtk+-5f6db9a18267c0ada85d3910d7d00e1fbc4a830d.tar.gz
combobox: Remove autoscroll timer on popdown
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkcombobox.c6
1 files changed, 6 insertions, 0 deletions
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;
}