From ec8444ed3a374ef757e7a61596455e922a64201d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 3 Sep 2001 01:43:53 +0000 Subject: [PATCH] Set current serial so that we don't eternally update the keymap after we Sun Sep 2 21:41:21 2001 Owen Taylor * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial so that we don't eternally update the keymap after we get a change notification. * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix incorrect cast. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/x11/gdkkeys-x11.c | 2 ++ gtk/gtkmenuitem.c | 2 +- 9 files changed, 66 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bcea963604..6db0a6c007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sun Sep 2 21:41:21 2001 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial + so that we don't eternally update the keymap after we + get a change notification. + + * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix + incorrect cast. + Sun Sep 2 23:27:16 2001 Kristian Rietveld * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bcea963604..6db0a6c007 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Sun Sep 2 21:41:21 2001 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial + so that we don't eternally update the keymap after we + get a change notification. + + * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix + incorrect cast. + Sun Sep 2 23:27:16 2001 Kristian Rietveld * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bcea963604..6db0a6c007 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Sun Sep 2 21:41:21 2001 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial + so that we don't eternally update the keymap after we + get a change notification. + + * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix + incorrect cast. + Sun Sep 2 23:27:16 2001 Kristian Rietveld * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bcea963604..6db0a6c007 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Sun Sep 2 21:41:21 2001 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial + so that we don't eternally update the keymap after we + get a change notification. + + * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix + incorrect cast. + Sun Sep 2 23:27:16 2001 Kristian Rietveld * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bcea963604..6db0a6c007 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Sun Sep 2 21:41:21 2001 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial + so that we don't eternally update the keymap after we + get a change notification. + + * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix + incorrect cast. + Sun Sep 2 23:27:16 2001 Kristian Rietveld * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bcea963604..6db0a6c007 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Sun Sep 2 21:41:21 2001 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial + so that we don't eternally update the keymap after we + get a change notification. + + * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix + incorrect cast. + Sun Sep 2 23:27:16 2001 Kristian Rietveld * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bcea963604..6db0a6c007 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Sun Sep 2 21:41:21 2001 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (update_keymaps): Set current serial + so that we don't eternally update the keymap after we + get a change notification. + + * gtk/gtkmenuitem.c (gtk_menu_item_set_right_justified): Fix + incorrect cast. + Sun Sep 2 23:27:16 2001 Kristian Rietveld * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 4b353c8573..e1249cea1c 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -124,6 +124,8 @@ update_keymaps (void) gint i; gint map_size; + current_serial = _gdk_keymap_serial; + update_keyrange (); if (keymap) diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 2fbb220219..627d38c61f 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -840,7 +840,7 @@ gtk_menu_item_set_right_justified (GtkMenuItem *menu_item, if (right_justified != menu_item->right_justify) { menu_item->right_justify = right_justified; - gtk_widget_queue_resize (GTK_MENU_ITEM (menu_item)); + gtk_widget_queue_resize (GTK_WIDGET (menu_item)); } }