AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Just remove the scroll timeout here, don't access settings. (#348095,

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2006-07-20 19:07:51 +00:00 committed by Matthias Clasen
parent 4e7097ff08
commit 9fef5e76ab
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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)

3
ChangeLog.pre-2-10
View File

@ -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)

11
gtk/gtkmenu.c
View File

@ -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;