Set current serial so that we don't eternally update the keymap after we

Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index bcea963604144fbc677f8f3a86b1fd134021da9c..6db0a6c00765aaba9330d9c60b5639626a68ad05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bcea963604144fbc677f8f3a86b1fd134021da9c..6db0a6c00765aaba9330d9c60b5639626a68ad05 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bcea963604144fbc677f8f3a86b1fd134021da9c..6db0a6c00765aaba9330d9c60b5639626a68ad05 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bcea963604144fbc677f8f3a86b1fd134021da9c..6db0a6c00765aaba9330d9c60b5639626a68ad05 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bcea963604144fbc677f8f3a86b1fd134021da9c..6db0a6c00765aaba9330d9c60b5639626a68ad05 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bcea963604144fbc677f8f3a86b1fd134021da9c..6db0a6c00765aaba9330d9c60b5639626a68ad05 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <kristian@planet.nl>
 
        * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bcea963604144fbc677f8f3a86b1fd134021da9c..6db0a6c00765aaba9330d9c60b5639626a68ad05 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sun Sep  2 21:41:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <kristian@planet.nl>
 
        * 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 4b353c85731c69fedff8700f748167042f238a31..e1249cea1cd65aa2a5c78d7ff42d8ac690b90309 100644 (file)
--- 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 2fbb220219c6860354209fed710500c1ce796eaf..627d38c61f9fbf8d3539b20465c4c26b427c7f94 100644 (file)
--- 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));
     }
 }