Only return FALSE when the clear event is been rejected, not when widget

Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkselection.c (gtk_selection_clear): Only return
	FALSE when the clear event is been rejected, not when
	widget has already lost the selection. (Which should
	only happen when we are setting the selection to another
	widget ourself.)

8 files changed, 116 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index bdbbdf0fc..831b98a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkselection.c (gtk_selection_clear): Only return
+	FALSE when the clear event is been rejected, not when
+	widget has already lost the selection. (Which should
+	only happen when we are setting the selection to another
+	widget ourself.)
+	
+Fri Apr 24 19:07:32 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkfixed.c gtk/gtkpaned.c gtk/gtktable.c:
+
+	Removed the "check visibility after gtk_widget_unparent" bug 
+	in hopefully the last three places.
+
 Tue Apr 28 15:46:41 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkrc.c (gtk_rc_parse_statement): allow the inclusion of other
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bdbbdf0fc..831b98a4a 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkselection.c (gtk_selection_clear): Only return
+	FALSE when the clear event is been rejected, not when
+	widget has already lost the selection. (Which should
+	only happen when we are setting the selection to another
+	widget ourself.)
+	
+Fri Apr 24 19:07:32 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkfixed.c gtk/gtkpaned.c gtk/gtktable.c:
+
+	Removed the "check visibility after gtk_widget_unparent" bug 
+	in hopefully the last three places.
+
 Tue Apr 28 15:46:41 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkrc.c (gtk_rc_parse_statement): allow the inclusion of other
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bdbbdf0fc..831b98a4a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkselection.c (gtk_selection_clear): Only return
+	FALSE when the clear event is been rejected, not when
+	widget has already lost the selection. (Which should
+	only happen when we are setting the selection to another
+	widget ourself.)
+	
+Fri Apr 24 19:07:32 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkfixed.c gtk/gtkpaned.c gtk/gtktable.c:
+
+	Removed the "check visibility after gtk_widget_unparent" bug 
+	in hopefully the last three places.
+
 Tue Apr 28 15:46:41 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkrc.c (gtk_rc_parse_statement): allow the inclusion of other
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bdbbdf0fc..831b98a4a 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkselection.c (gtk_selection_clear): Only return
+	FALSE when the clear event is been rejected, not when
+	widget has already lost the selection. (Which should
+	only happen when we are setting the selection to another
+	widget ourself.)
+	
+Fri Apr 24 19:07:32 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkfixed.c gtk/gtkpaned.c gtk/gtktable.c:
+
+	Removed the "check visibility after gtk_widget_unparent" bug 
+	in hopefully the last three places.
+
 Tue Apr 28 15:46:41 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkrc.c (gtk_rc_parse_statement): allow the inclusion of other
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bdbbdf0fc..831b98a4a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkselection.c (gtk_selection_clear): Only return
+	FALSE when the clear event is been rejected, not when
+	widget has already lost the selection. (Which should
+	only happen when we are setting the selection to another
+	widget ourself.)
+	
+Fri Apr 24 19:07:32 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkfixed.c gtk/gtkpaned.c gtk/gtktable.c:
+
+	Removed the "check visibility after gtk_widget_unparent" bug 
+	in hopefully the last three places.
+
 Tue Apr 28 15:46:41 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkrc.c (gtk_rc_parse_statement): allow the inclusion of other
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bdbbdf0fc..831b98a4a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkselection.c (gtk_selection_clear): Only return
+	FALSE when the clear event is been rejected, not when
+	widget has already lost the selection. (Which should
+	only happen when we are setting the selection to another
+	widget ourself.)
+	
+Fri Apr 24 19:07:32 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkfixed.c gtk/gtkpaned.c gtk/gtktable.c:
+
+	Removed the "check visibility after gtk_widget_unparent" bug 
+	in hopefully the last three places.
+
 Tue Apr 28 15:46:41 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkrc.c (gtk_rc_parse_statement): allow the inclusion of other
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bdbbdf0fc..831b98a4a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+Tue Apr 28 22:13:54 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkselection.c (gtk_selection_clear): Only return
+	FALSE when the clear event is been rejected, not when
+	widget has already lost the selection. (Which should
+	only happen when we are setting the selection to another
+	widget ourself.)
+	
+Fri Apr 24 19:07:32 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gtk/gtkfixed.c gtk/gtkpaned.c gtk/gtktable.c:
+
+	Removed the "check visibility after gtk_widget_unparent" bug 
+	in hopefully the last three places.
+
 Tue Apr 28 15:46:41 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkrc.c (gtk_rc_parse_statement): allow the inclusion of other
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index ba6148cd8..3f4dffa1a 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -630,12 +630,17 @@ gtk_selection_clear (GtkWidget *widget,
       tmp_list = tmp_list->next;
     }
     
-  if (tmp_list == NULL || selection_info->time > event->time)
-    return FALSE;
-
-  current_selections = g_list_remove_link (current_selections, tmp_list);
-  g_list_free (tmp_list);
-  g_free (selection_info);
+  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);
+      }
 
   return TRUE;
 }