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)

diff --git a/ChangeLog b/ChangeLog
index 3327f4e2d4e9a227923332f13eb08d50a7f7d32d..0531f95208fb4dce25517081007b42a5cbc8f66b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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)
+
        * gtk/gtktextlayout.c (gtk_text_layout_set_contexts): Fix
        messed up refcounting.  (#348090, Chris Wilson)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3327f4e2d4e9a227923332f13eb08d50a7f7d32d..0531f95208fb4dce25517081007b42a5cbc8f66b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 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)
+
        * gtk/gtktextlayout.c (gtk_text_layout_set_contexts): Fix
        messed up refcounting.  (#348090, Chris Wilson)
 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b7d997799e4ad378efa5db2d13156904dd8d18ca..d548edd7a072911c1da1594501c90d510c78ce71 100644 (file)
--- 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;