diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-07-20 19:07:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-20 19:07:51 +0000 |
| commit | 9fef5e76ab500173140b4b8da1ae6bbe25d0572d (patch) | |
| tree | 39711a4adf86270db1e61c704aaca34b2442762f /gtk/gtkmenu.c | |
| parent | 4e7097ff0837ce4d57c07cb0fb5faae5cd64a46d (diff) | |
| download | gdk-pixbuf-9fef5e76ab500173140b4b8da1ae6bbe25d0572d.tar.gz | |
Just remove the scroll timeout here, don't access settings. (#348095,
2006-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_destroy): Just remove the scroll
timeout here, don't access settings. (#348095, Chris Wilson)
Diffstat (limited to 'gtk/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index b7d997799..d548edd7a 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -910,7 +910,7 @@ gtk_menu_destroy (GtkObject *object) menu = GTK_MENU (object); - gtk_menu_stop_scrolling (menu); + gtk_menu_remove_scroll_timeout (menu); data = g_object_get_data (G_OBJECT (object), attach_data_key); if (data) @@ -3956,13 +3956,14 @@ gtk_menu_stop_scrolling (GtkMenu *menu) { GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (menu)); gboolean touchscreen_mode; + gboolean was_scrolling; gtk_menu_remove_scroll_timeout (menu); - + g_object_get (G_OBJECT (settings), - "gtk-touchscreen-mode", &touchscreen_mode, - NULL); - + "gtk-touchscreen-mode", &touchscreen_mode, + NULL); + if (!touchscreen_mode) { menu->upper_arrow_prelight = FALSE; |