diff --git a/ChangeLog b/ChangeLog index bc3b1561d4..743f2bcb24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue May 5 11:03:00 1998 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_clear): Fixed + reversed conditionals that caused segfault on some + platforms. + +Tue May 5 00:44:47 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment): + cast to GTK_OBJECT for gtk_object_ref. + Mon May 4 21:07:36 PDT 1998 Shawn T. Amundson * Released GTK 1.0.1 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bc3b1561d4..743f2bcb24 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Tue May 5 11:03:00 1998 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_clear): Fixed + reversed conditionals that caused segfault on some + platforms. + +Tue May 5 00:44:47 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment): + cast to GTK_OBJECT for gtk_object_ref. + Mon May 4 21:07:36 PDT 1998 Shawn T. Amundson * Released GTK 1.0.1 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bc3b1561d4..743f2bcb24 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Tue May 5 11:03:00 1998 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_clear): Fixed + reversed conditionals that caused segfault on some + platforms. + +Tue May 5 00:44:47 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment): + cast to GTK_OBJECT for gtk_object_ref. + Mon May 4 21:07:36 PDT 1998 Shawn T. Amundson * Released GTK 1.0.1 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bc3b1561d4..743f2bcb24 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Tue May 5 11:03:00 1998 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_clear): Fixed + reversed conditionals that caused segfault on some + platforms. + +Tue May 5 00:44:47 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment): + cast to GTK_OBJECT for gtk_object_ref. + Mon May 4 21:07:36 PDT 1998 Shawn T. Amundson * Released GTK 1.0.1 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bc3b1561d4..743f2bcb24 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Tue May 5 11:03:00 1998 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_clear): Fixed + reversed conditionals that caused segfault on some + platforms. + +Tue May 5 00:44:47 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment): + cast to GTK_OBJECT for gtk_object_ref. + Mon May 4 21:07:36 PDT 1998 Shawn T. Amundson * Released GTK 1.0.1 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bc3b1561d4..743f2bcb24 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Tue May 5 11:03:00 1998 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_clear): Fixed + reversed conditionals that caused segfault on some + platforms. + +Tue May 5 00:44:47 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment): + cast to GTK_OBJECT for gtk_object_ref. + Mon May 4 21:07:36 PDT 1998 Shawn T. Amundson * Released GTK 1.0.1 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bc3b1561d4..743f2bcb24 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Tue May 5 11:03:00 1998 Owen Taylor + + * gtk/gtkselection.c (gtk_selection_clear): Fixed + reversed conditionals that caused segfault on some + platforms. + +Tue May 5 00:44:47 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment): + cast to GTK_OBJECT for gtk_object_ref. + Mon May 4 21:07:36 PDT 1998 Shawn T. Amundson * Released GTK 1.0.1 diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index de7b350a02..966358db93 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -1116,7 +1116,7 @@ gtk_container_set_focus_vadjustment (GtkContainer *container, g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); if (adjustment) - gtk_object_ref (adjustment); + gtk_object_ref (GTK_OBJECT(adjustment)); gtk_object_set_data_by_id_full (GTK_OBJECT (container), vadjustment_key_id, @@ -1134,7 +1134,7 @@ gtk_container_set_focus_hadjustment (GtkContainer *container, g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); if (adjustment) - gtk_object_ref (adjustment); + gtk_object_ref (GTK_OBJECT (adjustment)); gtk_object_set_data_by_id_full (GTK_OBJECT (container), hadjustment_key_id, diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 3f4dffa1a5..0f5e2c509a 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -630,18 +630,20 @@ gtk_selection_clear (GtkWidget *widget, tmp_list = tmp_list->next; } - if (selection_info->time > event->time) - return FALSE; /* return FALSE to indicate that + if (tmp_list) + { + if (selection_info->time > event->time) + return FALSE; /* return FALSE to indicate that * the selection was out of date, * and this clear should be ignored */ - else - if (tmp_list) - { - current_selections = g_list_remove_link (current_selections, tmp_list); - g_list_free (tmp_list); - g_free (selection_info); - } - + else + { + current_selections = g_list_remove_link (current_selections, tmp_list); + g_list_free (tmp_list); + g_free (selection_info); + } + } + return TRUE; }