diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | gdk/gdkdnd.c | 5 | ||||
| -rw-r--r-- | gdk/gdkevents.c | 4 | ||||
| -rw-r--r-- | gdk/x11/gdkdnd-x11.c | 5 | ||||
| -rw-r--r-- | gdk/x11/gdkevents-x11.c | 4 |
11 files changed, 75 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Thu Jan 21 01:15:28 1999 Jeff Garzik <jgarzik@pobox.com> + + * gdk/gdkdnd.c (gdk_drag_context_unref): + Move not-null assertion before pointer de-ref. + + * gdk/gdkevents.c (gdk_event_queue_find_first): + Fix infinite loop bug. Someone should look at this further to + make sure the events_pending tests are correct. + Thu Jan 21 00:44:47 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8af850f9a3..0b4468d5a3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Thu Jan 21 01:15:28 1999 Jeff Garzik <jgarzik@pobox.com> + + * gdk/gdkdnd.c (gdk_drag_context_unref): + Move not-null assertion before pointer de-ref. + + * gdk/gdkevents.c (gdk_event_queue_find_first): + Fix infinite loop bug. Someone should look at this further to + make sure the events_pending tests are correct. + Thu Jan 21 00:44:47 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8af850f9a3..0b4468d5a3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Thu Jan 21 01:15:28 1999 Jeff Garzik <jgarzik@pobox.com> + + * gdk/gdkdnd.c (gdk_drag_context_unref): + Move not-null assertion before pointer de-ref. + + * gdk/gdkevents.c (gdk_event_queue_find_first): + Fix infinite loop bug. Someone should look at this further to + make sure the events_pending tests are correct. + Thu Jan 21 00:44:47 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8af850f9a3..0b4468d5a3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Thu Jan 21 01:15:28 1999 Jeff Garzik <jgarzik@pobox.com> + + * gdk/gdkdnd.c (gdk_drag_context_unref): + Move not-null assertion before pointer de-ref. + + * gdk/gdkevents.c (gdk_event_queue_find_first): + Fix infinite loop bug. Someone should look at this further to + make sure the events_pending tests are correct. + Thu Jan 21 00:44:47 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8af850f9a3..0b4468d5a3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Thu Jan 21 01:15:28 1999 Jeff Garzik <jgarzik@pobox.com> + + * gdk/gdkdnd.c (gdk_drag_context_unref): + Move not-null assertion before pointer de-ref. + + * gdk/gdkevents.c (gdk_event_queue_find_first): + Fix infinite loop bug. Someone should look at this further to + make sure the events_pending tests are correct. + Thu Jan 21 00:44:47 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8af850f9a3..0b4468d5a3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Thu Jan 21 01:15:28 1999 Jeff Garzik <jgarzik@pobox.com> + + * gdk/gdkdnd.c (gdk_drag_context_unref): + Move not-null assertion before pointer de-ref. + + * gdk/gdkevents.c (gdk_event_queue_find_first): + Fix infinite loop bug. Someone should look at this further to + make sure the events_pending tests are correct. + Thu Jan 21 00:44:47 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8af850f9a3..0b4468d5a3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Thu Jan 21 01:15:28 1999 Jeff Garzik <jgarzik@pobox.com> + + * gdk/gdkdnd.c (gdk_drag_context_unref): + Move not-null assertion before pointer de-ref. + + * gdk/gdkevents.c (gdk_event_queue_find_first): + Fix infinite loop bug. Someone should look at this further to + make sure the events_pending tests are correct. + Thu Jan 21 00:44:47 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index c3fdaa58be..b2653628a5 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -131,10 +131,11 @@ void gdk_drag_context_unref (GdkDragContext *context) { GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; - private->ref_count--; - + g_return_if_fail (context != NULL); + private->ref_count--; + if (private->ref_count == 0) { g_dataset_destroy (private); diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 5eb1b7815b..75dd891ddd 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -153,9 +153,11 @@ gdk_event_queue_find_first (void) while (tmp_list) { - GdkEventPrivate *event = queued_events->data; + GdkEventPrivate *event = tmp_list->data; if (!(event->flags & GDK_EVENT_PENDING)) return tmp_list; + + tmp_list = g_list_next (tmp_list); } return NULL; diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index c3fdaa58be..b2653628a5 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -131,10 +131,11 @@ void gdk_drag_context_unref (GdkDragContext *context) { GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; - private->ref_count--; - + g_return_if_fail (context != NULL); + private->ref_count--; + if (private->ref_count == 0) { g_dataset_destroy (private); diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 5eb1b7815b..75dd891ddd 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -153,9 +153,11 @@ gdk_event_queue_find_first (void) while (tmp_list) { - GdkEventPrivate *event = queued_events->data; + GdkEventPrivate *event = tmp_list->data; if (!(event->flags & GDK_EVENT_PENDING)) return tmp_list; + + tmp_list = g_list_next (tmp_list); } return NULL; |