Oops. My last commit was made form the wrong tree and code that

was under development was accidentally checked in. This reverses the
changes.

svn path=/trunk/; revision=1342

1 files changed, 23 insertions, 2 deletions

diff --git a/file.c b/file.c
index 56205516d5..06d3df9134 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.138 1999/12/15 06:51:47 gram Exp $
+ * $Id: file.c,v 1.139 1999/12/15 07:01:33 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1326,6 +1326,9 @@ change_time_formats(capture_file *cf)
 static void
 clear_tree_and_hex_views(void)
 {
+  GList *selection;
+  GtkWidget *tmp_item;
+
   /* Clear the hex dump. */
   gtk_text_freeze(GTK_TEXT(byte_view));
   gtk_text_set_point(GTK_TEXT(byte_view), 0);
@@ -1333,7 +1336,25 @@ clear_tree_and_hex_views(void)
     gtk_text_get_length(GTK_TEXT(byte_view)));
   gtk_text_thaw(GTK_TEXT(byte_view));
 
-  gtk_clist_clear ( GTK_CLIST(tree_view) );
+  /* Deselect any selected tree item. gtktree.c should
+   * do this when we clear_items, but it doesn't. I copied
+   * this while() loop from gtktree.c, gtk_real_tree_select_child()
+   */
+  if (GTK_TREE(tree_view)->root_tree) {
+	  selection = GTK_TREE(tree_view)->root_tree->selection;
+	  while (selection) {
+		  tmp_item = selection->data;
+		  gtk_tree_item_deselect(GTK_TREE_ITEM(tmp_item));
+		  gtk_widget_unref(tmp_item);
+		  selection = selection->next;
+	  }
+	  g_list_free(GTK_TREE(tree_view)->root_tree->selection);
+	  GTK_TREE(tree_view)->root_tree->selection = NULL;
+  }
+
+  /* Clear the protocol tree view. The length arg of -1
+   * means to clear all items up to the end. */
+  gtk_tree_clear_items(GTK_TREE(tree_view), 0, -1);
 }
 
 gboolean