Merged changes from gtk-1-0. Check ChangeLog for details.

1 files changed, 11 insertions, 6 deletions

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index ba6148cd8a..3f4dffa1a5 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;
 }