Fix serial number comparison regression introduced recently. (#474897)

2007-09-10  Behdad Esfahbod  <behdad@gnome.org>

        * gdk/x11/gdkgeometry-x11.c (gdk_window_queue),
        (_gdk_window_process_expose): Fix serial number comparison regression
        introduced recently. (#474897)


svn path=/trunk/; revision=18789
This commit is contained in:
Behdad Esfahbod 2007-09-10 18:07:39 +00:00 committed by Behdad Esfahbod
parent d7d3690f89
commit c99b1edf39
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2007-09-10 Behdad Esfahbod <behdad@gnome.org>
* gdk/x11/gdkgeometry-x11.c (gdk_window_queue),
(_gdk_window_process_expose): Fix serial number comparison regression
introduced recently. (#474897)
2007-09-10 Richard Hult <richard@imendio.com> 2007-09-10 Richard Hult <richard@imendio.com>
* gtk/gtksearchenginesimple.h: Build fix, correct a typo in the * gtk/gtksearchenginesimple.h: Build fix, correct a typo in the

View File

@ -1052,7 +1052,8 @@ gdk_window_queue (GdkWindow *window,
GdkWindowQueueItem *item = tmp_list->data; GdkWindowQueueItem *item = tmp_list->data;
GList *next = tmp_list->next; GList *next = tmp_list->next;
if (serial - item->serial < 0x7FFFFFFF) /* an overflow-safe (item->serial < serial) */
if (item->serial - serial > (gulong) G_MAXLONG)
{ {
queue_delete_link (display_x11->translate_queue, tmp_list); queue_delete_link (display_x11->translate_queue, tmp_list);
queue_item_free (item); queue_item_free (item);
@ -1143,7 +1144,9 @@ _gdk_window_process_expose (GdkWindow *window,
{ {
GdkWindowQueueItem *item = tmp_list->data; GdkWindowQueueItem *item = tmp_list->data;
GList *next = tmp_list->next; GList *next = tmp_list->next;
if (item->serial - serial < 0x7FFFFFFF)
/* an overflow-safe (serial < item->serial) */
if (serial - item->serial > (gulong) G_MAXLONG)
{ {
if (item->window == window) if (item->window == window)
{ {