summaryrefslogtreecommitdiff
path: root/gtk/gtkscrolledwindow.c
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-10-22 18:45:00 +0200
committerBastien Nocera <hadess@hadess.net>2013-10-23 15:22:31 +0200
commit255fafb891f0156f1da1e742c15288aac0c4d9da (patch)
tree59f4a3aa78bb74dc85dbd4bdebad86e5094df5c7 /gtk/gtkscrolledwindow.c
parent7c12e6480b03bca9795343f5a38754740e36d86c (diff)
downloadgtk+-255fafb891f0156f1da1e742c15288aac0c4d9da.tar.gz
GtkScrolledWindow: Disconnect from frame clock properly
The tick callback IDs from GtkWidget aren't timeouts, so use the correct function to disconnect from them. Spotted by Benjamin Otte <otte@redhat.com> https://bugzilla.gnome.org/show_bug.cgi?id=710666
Diffstat (limited to 'gtk/gtkscrolledwindow.c')
-rw-r--r--gtk/gtkscrolledwindow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index e60058b5e9..56cf662968 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1080,7 +1080,7 @@ gtk_scrolled_window_set_kinetic_scrolling (GtkScrolledWindow *scrolled_window,
}
if (priv->deceleration_id)
{
- g_source_remove (priv->deceleration_id);
+ gtk_widget_remove_tick_callback (GTK_WIDGET (scrolled_window), priv->deceleration_id);
priv->deceleration_id = 0;
}
}
@@ -1187,7 +1187,7 @@ gtk_scrolled_window_destroy (GtkWidget *widget)
}
if (priv->deceleration_id)
{
- g_source_remove (priv->deceleration_id);
+ gtk_widget_remove_tick_callback (widget, priv->deceleration_id);
priv->deceleration_id = 0;
}