Fixed reversed conditionals that caused segfault on some platforms.

Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkselection.c (gtk_selection_clear): Fixed
	reversed conditionals that caused segfault on some
	platforms.

Tue May  5 00:44:47 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment):
	cast to GTK_OBJECT for gtk_object_ref.
This commit is contained in:
Owen Taylor
1998-05-05 15:38:02 +00:00
committed by Owen Taylor
parent 668c7604a9
commit 7d6aff77e5
9 changed files with 91 additions and 12 deletions

View File

@@ -1,3 +1,14 @@
Tue May 5 11:03:00 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkselection.c (gtk_selection_clear): Fixed
reversed conditionals that caused segfault on some
platforms.
Tue May 5 00:44:47 1998 Owen Taylor <otaylor@gtk.org>
* 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 <amundson@gtk.org>
* Released GTK 1.0.1

View File

@@ -1,3 +1,14 @@
Tue May 5 11:03:00 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkselection.c (gtk_selection_clear): Fixed
reversed conditionals that caused segfault on some
platforms.
Tue May 5 00:44:47 1998 Owen Taylor <otaylor@gtk.org>
* 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 <amundson@gtk.org>
* Released GTK 1.0.1

View File

@@ -1,3 +1,14 @@
Tue May 5 11:03:00 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkselection.c (gtk_selection_clear): Fixed
reversed conditionals that caused segfault on some
platforms.
Tue May 5 00:44:47 1998 Owen Taylor <otaylor@gtk.org>
* 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 <amundson@gtk.org>
* Released GTK 1.0.1

View File

@@ -1,3 +1,14 @@
Tue May 5 11:03:00 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkselection.c (gtk_selection_clear): Fixed
reversed conditionals that caused segfault on some
platforms.
Tue May 5 00:44:47 1998 Owen Taylor <otaylor@gtk.org>
* 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 <amundson@gtk.org>
* Released GTK 1.0.1

View File

@@ -1,3 +1,14 @@
Tue May 5 11:03:00 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkselection.c (gtk_selection_clear): Fixed
reversed conditionals that caused segfault on some
platforms.
Tue May 5 00:44:47 1998 Owen Taylor <otaylor@gtk.org>
* 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 <amundson@gtk.org>
* Released GTK 1.0.1

View File

@@ -1,3 +1,14 @@
Tue May 5 11:03:00 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkselection.c (gtk_selection_clear): Fixed
reversed conditionals that caused segfault on some
platforms.
Tue May 5 00:44:47 1998 Owen Taylor <otaylor@gtk.org>
* 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 <amundson@gtk.org>
* Released GTK 1.0.1

View File

@@ -1,3 +1,14 @@
Tue May 5 11:03:00 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkselection.c (gtk_selection_clear): Fixed
reversed conditionals that caused segfault on some
platforms.
Tue May 5 00:44:47 1998 Owen Taylor <otaylor@gtk.org>
* 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 <amundson@gtk.org>
* Released GTK 1.0.1

View File

@@ -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,

View File

@@ -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;
}