GtkList to GtkTreeView conversion.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6261 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 754 insertions, 733 deletions

diff --git a/gtk2/dfilter_expr_dlg.c b/gtk2/dfilter_expr_dlg.c
index 240529679c..f856c9340b 100644
--- a/gtk2/dfilter_expr_dlg.c
+++ b/gtk2/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: dfilter_expr_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.3 2002/09/10 20:54:14 oabad Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -78,19 +78,23 @@ typedef struct protocol_data {
 } protocol_data_t;
 
 static void show_relations(GtkWidget *relation_label, GtkWidget *relation_list,
-    ftenum_t ftype);
+                           ftenum_t ftype);
 static gboolean relation_is_presence_test(const char *string);
 static void add_relation_list(GtkWidget *relation_list, char *relation);
 static void build_boolean_values(GtkWidget *value_list_scrolled_win,
-    GtkWidget *value_list, const true_false_string *values);
+                                 GtkWidget *value_list,
+                                 const true_false_string *values);
 static void build_enum_values(GtkWidget *value_list_scrolled_win,
-    GtkWidget *value_list, const value_string *values);
+                              GtkWidget *value_list,
+                              const value_string *values);
 static void add_value_list_item(GtkWidget *value_list, gchar *string,
-    gpointer data);
+                                gpointer data);
 static void display_value_fields(header_field_info *hfinfo,
-    gboolean is_comparison, GtkWidget *value_label, GtkWidget *value_entry,
-    GtkWidget *value_list, GtkWidget *value_list_scrolled_win,
-    GtkWidget *range_label, GtkWidget *range_entry);
+                                 gboolean is_comparison, GtkWidget *value_label,
+                                 GtkWidget *value_entry, GtkWidget *value_list,
+                                 GtkWidget *value_list_scrolled_win,
+                                 GtkWidget *range_label,
+                                 GtkWidget *range_entry);
 
 /*
  * Note that this is called every time the user clicks on an item,
@@ -124,139 +128,141 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer user_data)
     GtkTreeModel *model;
     GtkTreeIter   iter;
 
-    gtk_tree_selection_get_selected(sel, &model, &iter);
-    gtk_tree_model_get(model, &iter, 1, &hfinfo, -1);
+    if (gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+        gtk_tree_model_get(model, &iter, 1, &hfinfo, -1);
 
-    /*
-     * What was the item that was last selected?
-     */
-    cur_hfinfo = gtk_object_get_data(GTK_OBJECT(window),
-                                     E_DFILTER_EXPR_CURRENT_VAR_KEY);
-    if (cur_hfinfo == hfinfo) {
         /*
-         * It's still selected; no need to change anything.
+         * What was the item that was last selected?
          */
-        return;
-    }
-
-    /*
-     * Mark it as currently selected.
-     */
-    gtk_object_set_data(GTK_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY,
-                        hfinfo);
-
-    show_relations(relation_label, relation_list, hfinfo->type);
+        cur_hfinfo = gtk_object_get_data(GTK_OBJECT(window),
+                                         E_DFILTER_EXPR_CURRENT_VAR_KEY);
+        if (cur_hfinfo == hfinfo) {
+            /*
+             * It's still selected; no need to change anything.
+             */
+            return;
+        }
 
-    /*
-     * Set the label for the value to indicate what type of value
-     * it is.
-     */
-    value_type = ftype_pretty_name(hfinfo->type);
-    if (value_type != NULL) {
         /*
-         * Indicate what type of value it is.
+         * Mark it as currently selected.
          */
-        snprintf(value_label_string, sizeof value_label_string,
-                 "Value (%s)", value_type);
-        gtk_label_set_text(GTK_LABEL(value_label), value_label_string);
-    }
+        gtk_object_set_data(GTK_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY,
+                            hfinfo);
 
-    /*
-     * Clear the entry widget for the value, as whatever
-     * was there before doesn't apply.
-     */
-    gtk_entry_set_text(GTK_ENTRY(value_entry), "");
+        show_relations(relation_label, relation_list, hfinfo->type);
 
-    switch (hfinfo->type) {
+        /*
+         * Set the label for the value to indicate what type of value
+         * it is.
+         */
+        value_type = ftype_pretty_name(hfinfo->type);
+        if (value_type != NULL) {
+            /*
+             * Indicate what type of value it is.
+             */
+            snprintf(value_label_string, sizeof value_label_string,
+                     "Value (%s)", value_type);
+            gtk_label_set_text(GTK_LABEL(value_label), value_label_string);
+        }
 
-    case FT_BOOLEAN:
         /*
-         * The list of values should be the strings for "true"
-         * and "false"; show them in the value list.
+         * Clear the entry widget for the value, as whatever
+         * was there before doesn't apply.
          */
-        build_boolean_values(value_list_scrolled_win, value_list,
-                             hfinfo->strings);
-        break;
+        gtk_entry_set_text(GTK_ENTRY(value_entry), "");
+
+        switch (hfinfo->type) {
+
+        case FT_BOOLEAN:
+            /*
+             * The list of values should be the strings for "true"
+             * and "false"; show them in the value list.
+             */
+            build_boolean_values(value_list_scrolled_win, value_list,
+                                 hfinfo->strings);
+            break;
+
+        case FT_UINT8:
+        case FT_UINT16:
+        case FT_UINT24:
+        case FT_UINT32:
+        case FT_INT8:
+        case FT_INT16:
+        case FT_INT24:
+        case FT_INT32:
+            /*
+             * If this has a value_string table associated with it,
+             * fill up the list of values, otherwise clear the list
+             * of values.
+             */
+            if (hfinfo->strings != NULL) {
+                build_enum_values(value_list_scrolled_win, value_list,
+                                  hfinfo->strings);
+            } else
+                gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list))));
+            break;
+
+        default:
+            /*
+             * Clear the list of values.
+             */
+            gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list))));
+            break;
+        }
 
-    case FT_UINT8:
-    case FT_UINT16:
-    case FT_UINT24:
-    case FT_UINT32:
-    case FT_INT8:
-    case FT_INT16:
-    case FT_INT24:
-    case FT_INT32:
         /*
-         * If this has a value_string table associated with it,
-         * fill up the list of values, otherwise clear the list
-         * of values.
+         * Display various items for the value, as appropriate.
+         * The relation we start out with is never a comparison.
          */
-        if (hfinfo->strings != NULL) {
-            build_enum_values(value_list_scrolled_win, value_list,
-                              hfinfo->strings);
-        } else
-            gtk_list_clear_items(GTK_LIST(value_list), 0, -1);
-        break;
+        display_value_fields(hfinfo, FALSE, value_label, value_entry,
+                             value_list, value_list_scrolled_win, range_label, range_entry);
 
-    default:
         /*
-         * Clear the list of values.
+         * XXX - in browse mode, there always has to be something
+         * selected, so this should always be sensitive.
          */
-        gtk_list_clear_items(GTK_LIST(value_list), 0, -1);
-        break;
+        gtk_widget_set_sensitive(accept_bt, TRUE);
     }
+}
 
+static void
+show_relations(GtkWidget *relation_label, GtkWidget *relation_list,
+               ftenum_t ftype)
+{
     /*
-     * Display various items for the value, as appropriate.
-     * The relation we start out with is never a comparison.
+     * Clear out the currently displayed list of relations.
      */
-    display_value_fields(hfinfo, FALSE, value_label, value_entry,
-                         value_list, value_list_scrolled_win, range_label, range_entry);
+    gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(relation_list))));
 
     /*
-     * XXX - in browse mode, there always has to be something
-     * selected, so this should always be sensitive.
+     * Add the supported relations.
      */
-    gtk_widget_set_sensitive(accept_bt, TRUE);
-}
+    add_relation_list(relation_list, "is present");
+    if (ftype_can_eq(ftype) ||
+        (ftype_can_slice(ftype) && ftype_can_eq(FT_BYTES)))
+        add_relation_list(relation_list, "==");
+    if (ftype_can_ne(ftype) ||
+        (ftype_can_slice(ftype) && ftype_can_ne(FT_BYTES)))
+        add_relation_list(relation_list, "!=");
+    if (ftype_can_gt(ftype) ||
+        (ftype_can_slice(ftype) && ftype_can_gt(FT_BYTES)))
+        add_relation_list(relation_list, ">");
+    if (ftype_can_lt(ftype) ||
+        (ftype_can_slice(ftype) && ftype_can_lt(FT_BYTES)))
+        add_relation_list(relation_list, "<");
+    if (ftype_can_ge(ftype) ||
+        (ftype_can_slice(ftype) && ftype_can_ge(FT_BYTES)))
+        add_relation_list(relation_list, ">=");
+    if (ftype_can_le(ftype) ||
+        (ftype_can_slice(ftype) && ftype_can_le(FT_BYTES)))
+        add_relation_list(relation_list, "<=");
 
-static void
-show_relations(GtkWidget *relation_label, GtkWidget *relation_list,
-    ftenum_t ftype)
-{
-	/*
-	 * Clear out the currently displayed list of relations.
-	 */
-	gtk_list_clear_items(GTK_LIST(relation_list), 0, -1);
-
-	/*
-	 * Add the supported relations.
-	 */
-	add_relation_list(relation_list, "is present");
-	if (ftype_can_eq(ftype) ||
-	    (ftype_can_slice(ftype) && ftype_can_eq(FT_BYTES)))
-		add_relation_list(relation_list, "==");
-	if (ftype_can_ne(ftype) ||
-	    (ftype_can_slice(ftype) && ftype_can_ne(FT_BYTES)))
-		add_relation_list(relation_list, "!=");
-	if (ftype_can_gt(ftype) ||
-	    (ftype_can_slice(ftype) && ftype_can_gt(FT_BYTES)))
-		add_relation_list(relation_list, ">");
-	if (ftype_can_lt(ftype) ||
-	    (ftype_can_slice(ftype) && ftype_can_lt(FT_BYTES)))
-		add_relation_list(relation_list, "<");
-	if (ftype_can_ge(ftype) ||
-	    (ftype_can_slice(ftype) && ftype_can_ge(FT_BYTES)))
-		add_relation_list(relation_list, ">=");
-	if (ftype_can_le(ftype) ||
-	    (ftype_can_slice(ftype) && ftype_can_le(FT_BYTES)))
-		add_relation_list(relation_list, "<=");
-
-	/*
-	 * And show the list.
-	 */
-	gtk_widget_show(relation_label);
-	gtk_widget_show(relation_list);
+    /*
+     * And show the list.
+     */
+    gtk_widget_show(relation_label);
+    gtk_widget_show(relation_list);
 }
 
 /*
@@ -266,151 +272,146 @@ show_relations(GtkWidget *relation_label, GtkWidget *relation_list,
 static gboolean
 relation_is_presence_test(const char *string)
 {
-	return (strcmp(string, "is present") == 0);
+    return (strcmp(string, "is present") == 0);
 }
 
 static void
 add_relation_list(GtkWidget *relation_list, char *relation)
 {
-	GtkWidget *label, *item;
-
-	label = gtk_label_new(relation);
-	item = gtk_list_item_new();
+    GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(relation_list)));
+    GtkTreeIter   iter;
 
-	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_container_add(GTK_CONTAINER(item), label);
-	gtk_widget_show(label);
-	gtk_container_add(GTK_CONTAINER(relation_list), item);
-	gtk_widget_show(item);
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 0, relation, -1);
 }
 
 static void
-relation_list_sel_cb(GtkList *relation_list, GtkWidget *child _U_,
-    gpointer user_data _U_)
+relation_list_sel_cb(GtkTreeSelection *sel, gpointer user_data _U_)
 {
-	GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(relation_list));
-	GtkWidget *range_label = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_RANGE_LABEL_KEY);
-	GtkWidget *range_entry = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_RANGE_ENTRY_KEY);
-	GtkWidget *value_label = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_VALUE_LABEL_KEY);
-	GtkWidget *value_entry = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_VALUE_ENTRY_KEY);
-	GtkWidget *value_list = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_VALUE_LIST_KEY);
-	GtkWidget *value_list_scrolled_win = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_VALUE_LIST_SW_KEY);
-	header_field_info *hfinfo = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_CURRENT_VAR_KEY);
-	GList *sl;
-	GtkWidget *item, *item_label;
-	gchar *item_str;
-
-	/*
-	 * What's the relation?
-	 */
-	sl = GTK_LIST(relation_list)->selection;
-	item = GTK_WIDGET(sl->data);
-	item_label = GTK_BIN(item)->child;
-	gtk_label_get(GTK_LABEL(item_label), &item_str);
-
-	/*
-	 * Update the display of various items for the value, as appropriate.
-	 */
-	display_value_fields(hfinfo,
-	    !relation_is_presence_test(item_str),
-	    value_label, value_entry, value_list, value_list_scrolled_win,
-	    range_label, range_entry);
+    GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(gtk_tree_selection_get_tree_view(sel)));
+    GtkWidget *range_label =
+        gtk_object_get_data(GTK_OBJECT(window), E_DFILTER_EXPR_RANGE_LABEL_KEY);
+    GtkWidget *range_entry =
+        gtk_object_get_data(GTK_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY);
+    GtkWidget *value_label =
+        gtk_object_get_data(GTK_OBJECT(window), E_DFILTER_EXPR_VALUE_LABEL_KEY);
+    GtkWidget *value_entry =
+        gtk_object_get_data(GTK_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY);
+    GtkWidget *value_list =
+        gtk_object_get_data(GTK_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_KEY);
+    GtkWidget *value_list_scrolled_win =
+        gtk_object_get_data(GTK_OBJECT(window),
+                            E_DFILTER_EXPR_VALUE_LIST_SW_KEY);
+    header_field_info *hfinfo =
+        gtk_object_get_data(GTK_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY);
+    gchar *item_str;
+    GtkTreeModel *model;
+    GtkTreeIter   iter;
+
+    if (gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+        gtk_tree_model_get(model, &iter, 0, &item_str, -1);
+        /*
+         * Update the display of various items for the value, as appropriate.
+         */
+        display_value_fields(hfinfo,
+                             !relation_is_presence_test(item_str),
+                             value_label, value_entry, value_list,
+                             value_list_scrolled_win, range_label, range_entry);
+        g_free(item_str);
+    }
 }
 
 static void
 build_boolean_values(GtkWidget *value_list_scrolled_win, GtkWidget *value_list,
-    const true_false_string *values)
+                     const true_false_string *values)
 {
-	static const true_false_string true_false = { "True", "False" };
-
-	/*
-	 * Clear out the items for the list, and put in the names
-	 * from the value_string list.
-	 */
-	gtk_list_clear_items(GTK_LIST(value_list), 0, -1);
-
-	/*
-	 * Put the list in single mode, so we don't get any selection
-	 * events while we're building it (i.e., so we don't get any
-	 * on a list item BEFORE WE GET TO SET THE DATA FOR THE LIST
-	 * ITEM SO THAT THE HANDLER CAN HANDLE IT).
-	 */
-	gtk_list_set_selection_mode(GTK_LIST(value_list), GTK_SELECTION_SINGLE);
-
-	/*
-	 * Build the list.
-	 */
-	if (values == NULL)
-		values = &true_false;
-	add_value_list_item(value_list, values->true_string, (gpointer)values);
-	add_value_list_item(value_list, values->false_string, NULL);
-
-	/*
-	 * OK, we're done, so we can finally put it in browse mode.
-	 * Select the first item, so that the user doesn't have to, under
-	 * the assumption that they're most likely to test if something
-	 * is true, not false.
-	 */
-	gtk_list_set_selection_mode(GTK_LIST(value_list), GTK_SELECTION_BROWSE);
-	gtk_list_select_item(GTK_LIST(value_list), 0);
-
-	gtk_widget_show_all(value_list_scrolled_win);
+    static const true_false_string true_false = { "True", "False" };
+    GtkTreeSelection *sel;
+    GtkTreeIter       iter;
+
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(value_list));
+
+    /*
+     * Clear out the items for the list, and put in the names
+     * from the value_string list.
+     */
+    gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list))));
+
+    /*
+     * Put the list in single mode, so we don't get any selection
+     * events while we're building it (i.e., so we don't get any
+     * on a list item BEFORE WE GET TO SET THE DATA FOR THE LIST
+     * ITEM SO THAT THE HANDLER CAN HANDLE IT).
+     */
+    gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
+
+    /*
+     * Build the list.
+     */
+    if (values == NULL)
+        values = &true_false;
+    add_value_list_item(value_list, values->true_string, (gpointer)values);
+    add_value_list_item(value_list, values->false_string, NULL);
+
+    /*
+     * OK, we're done, so we can finally put it in browse mode.
+     * Select the first item, so that the user doesn't have to, under
+     * the assumption that they're most likely to test if something
+     * is true, not false.
+     */
+    gtk_tree_selection_set_mode(sel, GTK_SELECTION_BROWSE);
+    gtk_tree_model_get_iter_first(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list)),
+                                  &iter);
+    gtk_tree_selection_select_iter(sel, &iter);
+
+    gtk_widget_show_all(value_list_scrolled_win);
 }
 
 static void
 build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
-    const value_string *values)
+                  const value_string *values)
 {
-	/*
-	 * Clear out the items for the list, and put in the names
-	 * from the value_string list.
-	 */
-	gtk_list_clear_items(GTK_LIST(value_list), 0, -1);
-
-	/*
-	 * Put the list in single mode, so we don't get any selection
-	 * events while we're building it (i.e., so we don't get any
-	 * on a list item BEFORE WE GET TO SET THE DATA FOR THE LIST
-	 * ITEM SO THAT THE HANDLER CAN HANDLE IT).
-	 */
-	gtk_list_set_selection_mode(GTK_LIST(value_list), GTK_SELECTION_SINGLE);
-
-	/*
-	 * Build the list.
-	 */
-	while (values->strptr != NULL) {
-		add_value_list_item(value_list, values->strptr,
-		    (gpointer)values);
-		values++;
-	}
-
-	/*
-	 * OK, we're done, so we can finally put it in browse mode.
-	 */
-	gtk_list_set_selection_mode(GTK_LIST(value_list), GTK_SELECTION_BROWSE);
+    GtkTreeSelection *sel;
+
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(value_list));
+    /*
+     * Clear out the items for the list, and put in the names
+     * from the value_string list.
+     */
+    gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list))));
+
+    /*
+     * Put the list in single mode, so we don't get any selection
+     * events while we're building it (i.e., so we don't get any
+     * on a list item BEFORE WE GET TO SET THE DATA FOR THE LIST
+     * ITEM SO THAT THE HANDLER CAN HANDLE IT).
+     */
+    gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
+
+    /*
+     * Build the list.
+     */
+    while (values->strptr != NULL) {
+        add_value_list_item(value_list, values->strptr,
+                            (gpointer)values);
+        values++;
+    }
+
+    /*
+     * OK, we're done, so we can finally put it in browse mode.
+     */
+    gtk_tree_selection_set_mode(sel, GTK_SELECTION_BROWSE);
 }
 
 static void
 add_value_list_item(GtkWidget *value_list, gchar *string, gpointer data)
 {
-	GtkWidget *label, *item;
-
-	label = gtk_label_new(string);
-	item = gtk_list_item_new();
+    GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list)));
+    GtkTreeIter       iter;
 
-	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_container_add(GTK_CONTAINER(item), label);
-	gtk_widget_show(label);
-	gtk_container_add(GTK_CONTAINER(value_list), item);
-	gtk_object_set_data(GTK_OBJECT(item), E_DFILTER_EXPR_VALUE_KEY, data);
-	gtk_widget_show(item);
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 0, string, 1, data, -1);
 }
 
 /*
@@ -419,499 +420,506 @@ add_value_list_item(GtkWidget *value_list, gchar *string, gpointer data)
  */
 static void
 display_value_fields(header_field_info *hfinfo, gboolean is_comparison,
-    GtkWidget *value_label, GtkWidget *value_entry, GtkWidget *value_list _U_,
-    GtkWidget *value_list_scrolled_win, GtkWidget *range_label,
-    GtkWidget *range_entry)
+                     GtkWidget *value_label, GtkWidget *value_entry,
+                     GtkWidget *value_list _U_,
+                     GtkWidget *value_list_scrolled_win, GtkWidget *range_label,
+                     GtkWidget *range_entry)
 {
-	gboolean show_value_label = FALSE;
-
-	/*
-	 * Either:
-	 *
-	 *	this is an FT_NONE variable, in which case you can
-	 *	only check whether it's present or absent in the
-	 *	protocol tree
-	 *
-	 * or
-	 *
-	 *	this is a Boolean variable, in which case you
-	 *	can't specify a value to compare with, you can
-	 *	only specify whether to test for the Boolean
-	 *	being true or to test for it being false
-	 *
-	 * or
-	 *
-	 *	this isn't a Boolean variable, in which case you
-	 *	can test for its presence in the protocol tree,
-	 *	and the default relation is such a test, in
-	 *	which case you don't compare with a value
-	 *
-	 * so we hide the value entry.
-	 */
-	if (is_comparison) {
-		/*
-		 * The relation is a comparison; display the entry for
-		 * the value with which to compare.
-		 */
-		gtk_widget_show(value_entry);
-
-		/*
-		 * We're showing the entry; show the label as well.
-		 */
-		show_value_label = TRUE;
-	} else {
-		/*
-		 * The relation isn't a comparison; there's no value with
-		 * which to compare, so don't show the entry for it.
-		 */
-		gtk_widget_hide(value_entry);
-	}
-
-	switch (hfinfo->type) {
-
-	case FT_BOOLEAN:
-		if (is_comparison) {
-			/*
-			 * The relation is a comparison, so we're showing
-			 * an entry for the value with which to compare;
-			 * show the list of names for values as well.
-			 * (The list of values contains the strings for
-			 * "true" and "false".)
-			 */
-			gtk_widget_show_all(value_list_scrolled_win);
-
-			/*
-			 * We're showing the value list; show the label as
-			 * well.
-			 */
-			show_value_label = TRUE;
-		} else {
-			/*
-			 * It's not a comparison, so we're not showing
-			 * the entry for the value; don't show the
-			 * list of names for values, either.
-			 */
-			gtk_widget_hide_all(value_list_scrolled_win);
-		}
-		break;
-
-	case FT_UINT8:
-	case FT_UINT16:
-	case FT_UINT24:
-	case FT_UINT32:
-	case FT_INT8:
-	case FT_INT16:
-	case FT_INT24:
-	case FT_INT32:
-		if (hfinfo->strings != NULL) {
-			/*
-			 * We have a list of values to show.
-			 */
-			if (is_comparison) {
-				/*
-				 * The relation is a comparison, so we're
-				 * showing an entry for the value with
-				 * which to compare; show the list of
-				 * names for values as well.
-				 */
-				gtk_widget_show_all(value_list_scrolled_win);
-
-				/*
-				 * We're showing the entry; show the label
-				 * as well.
-				 */
-				show_value_label = TRUE;
-			} else {
-				/*
-				 * It's not a comparison, so we're not showing
-				 * the entry for the value; don't show the
-				 * list of names for values, either.
-				 */
-				gtk_widget_hide_all(value_list_scrolled_win);
-			}
-		} else {
-			/*
-			 * There is no list of names for values, so don't
-			 * show it.
-			 */
-			gtk_widget_hide_all(value_list_scrolled_win);
-		}
-		break;
-
-	default:
-		/*
-		 * There is no list of names for values; hide the list.
-		 */
-		gtk_widget_hide_all(value_list_scrolled_win);
-		break;
-	}
-
-	if (show_value_label)
-		gtk_widget_show(value_label);
-	else
-		gtk_widget_hide(value_label);
-
-	/*
-	 * Is this a comparison, and are ranges supported by this type?
-	 * If both are true, show the range stuff, otherwise hide it.
-	 */
-	if (is_comparison && ftype_can_slice(hfinfo->type)) {
-		gtk_widget_show(range_label);
-		gtk_widget_show(range_entry);
-	} else {
-		gtk_widget_hide(range_label);
-		gtk_widget_hide(range_entry);
-	}
+    gboolean show_value_label = FALSE;
+
+    /*
+     * Either:
+     *
+     *	this is an FT_NONE variable, in which case you can
+     *	only check whether it's present or absent in the
+     *	protocol tree
+     *
+     * or
+     *
+     *	this is a Boolean variable, in which case you
+     *	can't specify a value to compare with, you can
+     *	only specify whether to test for the Boolean
+     *	being true or to test for it being false
+     *
+     * or
+     *
+     *	this isn't a Boolean variable, in which case you
+     *	can test for its presence in the protocol tree,
+     *	and the default relation is such a test, in
+     *	which case you don't compare with a value
+     *
+     * so we hide the value entry.
+     */
+    if (is_comparison) {
+        /*
+         * The relation is a comparison; display the entry for
+         * the value with which to compare.
+         */
+        gtk_widget_show(value_entry);
+
+        /*
+         * We're showing the entry; show the label as well.
+         */
+        show_value_label = TRUE;
+    } else {
+        /*
+         * The relation isn't a comparison; there's no value with
+         * which to compare, so don't show the entry for it.
+         */
+        gtk_widget_hide(value_entry);
+    }
+
+    switch (hfinfo->type) {
+
+    case FT_BOOLEAN:
+        if (is_comparison) {
+            /*
+             * The relation is a comparison, so we're showing
+             * an entry for the value with which to compare;
+             * show the list of names for values as well.
+             * (The list of values contains the strings for
+             * "true" and "false".)
+             */
+            gtk_widget_show_all(value_list_scrolled_win);
+
+            /*
+             * We're showing the value list; show the label as
+             * well.
+             */
+            show_value_label = TRUE;
+        } else {
+            /*
+             * It's not a comparison, so we're not showing
+             * the entry for the value; don't show the
+             * list of names for values, either.
+             */
+            gtk_widget_hide_all(value_list_scrolled_win);
+        }
+        break;
+
+    case FT_UINT8:
+    case FT_UINT16:
+    case FT_UINT24:
+    case FT_UINT32:
+    case FT_INT8:
+    case FT_INT16:
+    case FT_INT24:
+    case FT_INT32:
+        if (hfinfo->strings != NULL) {
+            /*
+             * We have a list of values to show.
+             */
+            if (is_comparison) {
+                /*
+                 * The relation is a comparison, so we're
+                 * showing an entry for the value with
+                 * which to compare; show the list of
+                 * names for values as well.
+                 */
+                gtk_widget_show_all(value_list_scrolled_win);
+
+                /*
+                 * We're showing the entry; show the label
+                 * as well.
+                 */
+                show_value_label = TRUE;
+            } else {
+                /*
+                 * It's not a comparison, so we're not showing
+                 * the entry for the value; don't show the
+                 * list of names for values, either.
+                 */
+                gtk_widget_hide_all(value_list_scrolled_win);
+            }
+        } else {
+            /*
+             * There is no list of names for values, so don't
+             * show it.
+             */
+            gtk_widget_hide_all(value_list_scrolled_win);
+        }
+        break;
+
+    default:
+        /*
+         * There is no list of names for values; hide the list.
+         */
+        gtk_widget_hide_all(value_list_scrolled_win);
+        break;
+    }
+
+    if (show_value_label)
+        gtk_widget_show(value_label);
+    else
+        gtk_widget_hide(value_label);
+
+    /*
+     * Is this a comparison, and are ranges supported by this type?
+     * If both are true, show the range stuff, otherwise hide it.
+     */
+    if (is_comparison && ftype_can_slice(hfinfo->type)) {
+        gtk_widget_show(range_label);
+        gtk_widget_show(range_entry);
+    } else {
+        gtk_widget_hide(range_label);
+        gtk_widget_hide(range_entry);
+    }
 }
 
 static void
-value_list_sel_cb(GtkList *value_list, GtkWidget *child,
-    gpointer value_entry_arg)
+value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg)
 {
-	GtkWidget *value_entry = value_entry_arg;
-	GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(value_list));
-	header_field_info *hfinfo = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_CURRENT_VAR_KEY);
-	const value_string *value;
-	char value_string[11+1];	/* long enough for 32-bit octal value */
-
-	value = gtk_object_get_data(GTK_OBJECT(child),
-	    E_DFILTER_EXPR_VALUE_KEY);
-
-	/*
-	 * This should either be a numeric type or a Boolean type.
-	 */
-	if (hfinfo->type == FT_BOOLEAN) {
-		/*
-		 * Boolean type; if the value key for the selected item
-		 * is non-null, it's the item for "true", otherwise it's
-		 * the item for "false".  Compare with 1 if we're
-		 * testing for "true", and compare with 0 if we're
-		 * testing for "false".
-		 */
-		if (value != NULL)
-			strcpy(value_string, "1");
-		else
-			strcpy(value_string, "0");
-	} else {
-		/*
-		 * Numeric type; get the value corresponding to the
-		 * selected item, and display it in the base for this
-		 * field.
-		 */
-		switch (hfinfo->display) {
-
-		case BASE_DEC:
-		case BASE_BIN:	/* binary - treated as decimal, for now */
-			switch (hfinfo->type) {
-
-			case FT_UINT8:
-			case FT_UINT16:
-			case FT_UINT32:
-				snprintf(value_string, sizeof value_string,
-				    "%u", value->value);
-				break;
-
-			case FT_INT8:
-			case FT_INT16:
-			case FT_INT32:
-				snprintf(value_string, sizeof value_string,
-				    "%d", value->value);
-				break;
-
-			default:
-				g_assert_not_reached();
-			}
-			break;
-
-		case BASE_HEX:
-			snprintf(value_string, sizeof value_string, "0x%x",
-			    value->value);
-			break;
-
-		case BASE_OCT:
-			snprintf(value_string, sizeof value_string, "%#o",
-			    value->value);
-			break;
-
-		default:
-			g_assert_not_reached();
-		}
-	}
-	gtk_entry_set_text(GTK_ENTRY(value_entry), value_string);
+    GtkWidget *value_entry = value_entry_arg;
+    GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(gtk_tree_selection_get_tree_view(sel)));
+    GtkTreeModel *model;
+    GtkTreeIter   iter;
+    header_field_info *hfinfo = gtk_object_get_data(GTK_OBJECT(window),
+                                                    E_DFILTER_EXPR_CURRENT_VAR_KEY);
+    const value_string *value = NULL;
+    char value_string[11+1];	/* long enough for 32-bit octal value */
+
+    if (gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+        gtk_tree_model_get(model, &iter, 1, &value, -1);
+
+        /*
+         * This should either be a numeric type or a Boolean type.
+         */
+        if (hfinfo->type == FT_BOOLEAN) {
+            /*
+             * Boolean type; if the value key for the selected item
+             * is non-null, it's the item for "true", otherwise it's
+             * the item for "false".  Compare with 1 if we're
+             * testing for "true", and compare with 0 if we're
+             * testing for "false".
+             */
+            if (value != NULL)
+                strcpy(value_string, "1");
+            else
+                strcpy(value_string, "0");
+        } else {
+            /*
+             * Numeric type; get the value corresponding to the
+             * selected item, and display it in the base for this
+             * field.
+             */
+            switch (hfinfo->display) {
+
+            case BASE_DEC:
+            case BASE_BIN:	/* binary - treated as decimal, for now */
+                switch (hfinfo->type) {
+
+                case FT_UINT8:
+                case FT_UINT16:
+                case FT_UINT32:
+                    snprintf(value_string, sizeof value_string,
+                             "%u", value->value);
+                    break;
+
+                case FT_INT8:
+                case FT_INT16:
+                case FT_INT32:
+                    snprintf(value_string, sizeof value_string,
+                             "%d", value->value);
+                    break;
+
+                default:
+                    g_assert_not_reached();
+                }
+                break;
+
+            case BASE_HEX:
+                snprintf(value_string, sizeof value_string, "0x%x",
+                         value->value);
+                break;
+
+            case BASE_OCT:
+                snprintf(value_string, sizeof value_string, "%#o",
+                         value->value);
+                break;
+
+            default:
+                g_assert_not_reached();
+            }
+        }
+        gtk_entry_set_text(GTK_ENTRY(value_entry), value_string);
+    }
 }
 
 static void
 dfilter_report_bad_value(char *format, ...)
 {
-	char error_msg_buf[1024];
-	va_list args;
+    char error_msg_buf[1024];
+    va_list args;
 
-	va_start(args, format);
-	vsnprintf(error_msg_buf, sizeof error_msg_buf, format, args);
-	va_end(args);
+    va_start(args, format);
+    vsnprintf(error_msg_buf, sizeof error_msg_buf, format, args);
+    va_end(args);
 
-	simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
-	    "%s", error_msg_buf);
+    simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
+                  "%s", error_msg_buf);
 }
 
 static void
 dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
 {
-	GtkWidget *filter_te = filter_te_arg;
-	GtkWidget *window = gtk_widget_get_toplevel(w);
-	GtkWidget *relation_list = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_RELATION_LIST_KEY);
-	GtkWidget *range_entry = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_RANGE_ENTRY_KEY);
-	GtkWidget *value_entry = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_VALUE_ENTRY_KEY);
-	header_field_info *hfinfo;
-	GList *sl;
-	GtkWidget *item, *item_label;
-	gchar *item_str;
-	gchar *range_str, *stripped_range_str;
-	gchar *value_str, *stripped_value_str;
-	int pos;
-	gchar *chars;
-	ftenum_t ftype;
-	gboolean can_compare;
-	fvalue_t *fvalue;
-
-	/*
-	 * Get the variable to be tested.
-	 */
-	hfinfo = gtk_object_get_data(GTK_OBJECT(window),
-	    E_DFILTER_EXPR_CURRENT_VAR_KEY);
-
-	/*
-	 * Get the relation to use, if any.
-	 */
-	if (GTK_WIDGET_VISIBLE(relation_list)) {
-		/*
-		 * The list of relations is visible, so we can get a
-		 * relation operator from it.
-		 */
-		sl = GTK_LIST(relation_list)->selection;
-		item = GTK_WIDGET(sl->data);
-		item_label = GTK_BIN(item)->child;
-		gtk_label_get(GTK_LABEL(item_label), &item_str);
-	} else
-		item_str = NULL;	/* no relation operator */
-
-	/*
-	 * Get the range to use, if any.
-	 */
-	if (GTK_WIDGET_VISIBLE(range_entry)) {
-		range_str = g_strdup(gtk_entry_get_text(GTK_ENTRY(range_entry)));
-		stripped_range_str = g_strstrip(range_str);
-		if (strcmp(stripped_range_str, "") == 0) {
-			/*
-			 * No range was specified.
-			 */
-			g_free(range_str);
-			range_str = NULL;
-			stripped_range_str = NULL;
-		}
-
-		/*
-		 * XXX - check it for validity?
-		 */
-	} else {
-		range_str = NULL;
-		stripped_range_str = NULL;
-	}
-
-	/*
-	 * If a range was specified, the type of the LHS of the
-	 * comparison is FT_BYTES; otherwise, it's the type of the field.
-	 */
-	if (range_str == NULL)
-		ftype = hfinfo->type;
-	else
-		ftype = FT_BYTES;
-
-	/*
-	 * Make sure the relation is valid for the type in question.
-	 * We may be offering relations that the type of the field
-	 * can't support, because the field's type supports slicing,
-	 * and the relation *is* supported on byte strings.
-	 */
-	if (strcmp(item_str, "==") == 0)
-		can_compare = ftype_can_eq(ftype);
-	else if (strcmp(item_str, "!=") == 0)
-		can_compare = ftype_can_ne(ftype);
-	else if (strcmp(item_str, ">") == 0)
-		can_compare = ftype_can_gt(ftype);
-	else if (strcmp(item_str, "<") == 0)
-		can_compare = ftype_can_lt(ftype);
-	else if (strcmp(item_str, ">=") == 0)
-		can_compare = ftype_can_ge(ftype);
-	else if (strcmp(item_str, "<=") == 0)
-		can_compare = ftype_can_le(ftype);
-	else
-		can_compare = TRUE;	/* not a comparison */
-	if (!can_compare) {
-		if (range_str == NULL) {
-			simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
-			    "That field cannot be tested with \"%s\".",
-			    item_str);
-		} else {
-			simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
-			    "Ranges of that field cannot be tested with \"%s\".",
-			    item_str);
-		}
-		if (range_str != NULL)
-			g_free(range_str);
-		return;
-	}
-
-	/*
-	 * Get the value to use, if any.
-	 */
-	if (GTK_WIDGET_VISIBLE(value_entry)) {
-		value_str = g_strdup(gtk_entry_get_text(GTK_ENTRY(value_entry)));
-		stripped_value_str = g_strstrip(value_str);
-		if (strcmp(stripped_value_str, "") == 0) {
-			/*
-			 * This field takes a value, but they didn't supply
-			 * one.
-			 */
-			simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
-			    "That field must be compared with a value, "
-			    "but you didn't specify a value with which to "
-			    "compare it.");
-			if (range_str != NULL)
-				g_free(range_str);
-			g_free(value_str);
-			return;
-		}
-
-		/*
-		 * Make sure the value is valid.
-		 *
-		 * If no range string was specified, it must be valid
-		 * for the type of the field; if a range string was
-		 * specified, must be valid for FT_BYTES.
-		 */
-		fvalue = fvalue_from_string(ftype, stripped_value_str,
-		    dfilter_report_bad_value);
-		if (fvalue == NULL) {
-			/*
-			 * It's not valid.
-			 *
-			 * The dialog box was already popped up by
-			 * "dfilter_report_bad_value()".
-			 */
-			if (range_str != NULL)
-				g_free(range_str);
-			g_free(value_str);
-			return;
-		}
-		fvalue_free(fvalue);
-	} else {
-		value_str = NULL;
-		stripped_value_str = NULL;
-	}
-
-	/*
-	 * Insert the expression at the current cursor position.
-	 * If there's a non-whitespace character to the left of it,
-	 * insert a blank first; if there's a non-whitespace character
-	 * to the right of it, insert a blank after it.
-	 */
-	pos = gtk_editable_get_position(GTK_EDITABLE(filter_te));
-	chars = gtk_editable_get_chars(GTK_EDITABLE(filter_te), pos, pos + 1);
-	if (strcmp(chars, "") != 0 && !isspace((unsigned char)chars[0]))
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
-	g_free(chars);
-
-	gtk_editable_insert_text(GTK_EDITABLE(filter_te), hfinfo->abbrev,
-	    strlen(hfinfo->abbrev), &pos);
-	if (range_str != NULL) {
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te), "[", 1, &pos);
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te),
-		    stripped_range_str, strlen(stripped_range_str), &pos);
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te), "]", 1, &pos);
-		g_free(range_str);
-	}
-	if (item_str != NULL && !relation_is_presence_test(item_str)) {
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te), item_str,
-		    strlen(item_str), &pos);
-	}
-	if (value_str != NULL) {
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
-		switch (hfinfo->type) {
-
-		case FT_STRING:
-		case FT_STRINGZ:
-		case FT_UINT_STRING:
-			/*
-			 * Put quotes around the string.
-			 */
-			gtk_editable_insert_text(GTK_EDITABLE(filter_te), "\"",
-			    1, &pos);
-
-		default:
-			break;
-		}
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te),
-		    stripped_value_str, strlen(stripped_value_str), &pos);
-		switch (hfinfo->type) {
-
-		case FT_STRING:
-		case FT_STRINGZ:
-		case FT_UINT_STRING:
-			/*
-			 * Put quotes around the string.
-			 */
-			gtk_editable_insert_text(GTK_EDITABLE(filter_te), "\"",
-			    1, &pos);
-
-		default:
-			break;
-		}
-		g_free(value_str);
-	}
-	chars = gtk_editable_get_chars(GTK_EDITABLE(filter_te), pos + 1, pos + 2);
-	if (strcmp(chars, "") != 0 && !isspace((unsigned char)chars[0]))
-		gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
-	g_free(chars);
-
-	/*
-	 * Put the cursor after the expression we just entered into
-	 * the text entry widget.
-	 */
-	gtk_editable_set_position(GTK_EDITABLE(filter_te), pos);
-
-	/*
-	 * We're done; destroy the dialog box (which is the top-level
-	 * widget for the "Accept" button).
-	 */
-	gtk_widget_destroy(window);
+    GtkWidget *filter_te = filter_te_arg;
+    GtkWidget *window = gtk_widget_get_toplevel(w);
+    GtkWidget *relation_list = gtk_object_get_data(GTK_OBJECT(window),
+                                                   E_DFILTER_EXPR_RELATION_LIST_KEY);
+    GtkWidget *range_entry = gtk_object_get_data(GTK_OBJECT(window),
+                                                 E_DFILTER_EXPR_RANGE_ENTRY_KEY);
+    GtkWidget *value_entry = gtk_object_get_data(GTK_OBJECT(window),
+                                                 E_DFILTER_EXPR_VALUE_ENTRY_KEY);
+    header_field_info *hfinfo;
+    gchar        *item_str;
+    gchar        *range_str, *stripped_range_str;
+    gchar        *value_str, *stripped_value_str;
+    int           pos;
+    gchar        *chars;
+    ftenum_t      ftype;
+    gboolean      can_compare;
+    fvalue_t     *fvalue;
+    GtkTreeModel *model;
+    GtkTreeIter   iter;
+
+    /*
+     * Get the variable to be tested.
+     */
+    hfinfo = gtk_object_get_data(GTK_OBJECT(window),
+                                 E_DFILTER_EXPR_CURRENT_VAR_KEY);
+
+    /*
+     * Get the relation to use, if any.
+     */
+    if (GTK_WIDGET_VISIBLE(relation_list)) {
+        /*
+         * The list of relations is visible, so we can get a
+         * relation operator from it.
+         */
+        if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list)),
+                                            &model, &iter))
+            gtk_tree_model_get(model, &iter, 0, &item_str, -1);
+        else
+            item_str = NULL;
+    } else
+        item_str = NULL;	/* no relation operator */
+
+    /*
+     * Get the range to use, if any.
+     */
+    if (GTK_WIDGET_VISIBLE(range_entry)) {
+        range_str = g_strdup(gtk_entry_get_text(GTK_ENTRY(range_entry)));
+        stripped_range_str = g_strstrip(range_str);
+        if (strcmp(stripped_range_str, "") == 0) {
+            /*
+             * No range was specified.
+             */
+            g_free(range_str);
+            range_str = NULL;
+            stripped_range_str = NULL;
+        }
+
+        /*
+         * XXX - check it for validity?
+         */
+    } else {
+        range_str = NULL;
+        stripped_range_str = NULL;
+    }
+
+    /*
+     * If a range was specified, the type of the LHS of the
+     * comparison is FT_BYTES; otherwise, it's the type of the field.
+     */
+    if (range_str == NULL)
+        ftype = hfinfo->type;
+    else
+        ftype = FT_BYTES;
+
+    /*
+     * Make sure the relation is valid for the type in question.
+     * We may be offering relations that the type of the field
+     * can't support, because the field's type supports slicing,
+     * and the relation *is* supported on byte strings.
+     */
+    if (strcmp(item_str, "==") == 0)
+        can_compare = ftype_can_eq(ftype);
+    else if (strcmp(item_str, "!=") == 0)
+        can_compare = ftype_can_ne(ftype);
+    else if (strcmp(item_str, ">") == 0)
+        can_compare = ftype_can_gt(ftype);
+    else if (strcmp(item_str, "<") == 0)
+        can_compare = ftype_can_lt(ftype);
+    else if (strcmp(item_str, ">=") == 0)
+        can_compare = ftype_can_ge(ftype);
+    else if (strcmp(item_str, "<=") == 0)
+        can_compare = ftype_can_le(ftype);
+    else
+        can_compare = TRUE;	/* not a comparison */
+    if (!can_compare) {
+        if (range_str == NULL) {
+            simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
+                          "That field cannot be tested with \"%s\".",
+                          item_str);
+        } else {
+            simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
+                          "Ranges of that field cannot be tested with \"%s\".",
+                          item_str);
+        }
+        if (range_str != NULL)
+            g_free(range_str);
+        return;
+    }
+
+    /*
+     * Get the value to use, if any.
+     */
+    if (GTK_WIDGET_VISIBLE(value_entry)) {
+        value_str = g_strdup(gtk_entry_get_text(GTK_ENTRY(value_entry)));
+        stripped_value_str = g_strstrip(value_str);
+        if (strcmp(stripped_value_str, "") == 0) {
+            /*
+             * This field takes a value, but they didn't supply
+             * one.
+             */
+            simple_dialog(ESD_TYPE_CRIT | ESD_TYPE_MODAL, NULL,
+                          "That field must be compared with a value, "
+                          "but you didn't specify a value with which to "
+                          "compare it.");
+            if (range_str != NULL)
+                g_free(range_str);
+            g_free(value_str);
+            return;
+        }
+
+        /*
+         * Make sure the value is valid.
+         *
+         * If no range string was specified, it must be valid
+         * for the type of the field; if a range string was
+         * specified, must be valid for FT_BYTES.
+         */
+        fvalue = fvalue_from_string(ftype, stripped_value_str,
+                                    dfilter_report_bad_value);
+        if (fvalue == NULL) {
+            /*
+             * It's not valid.
+             *
+             * The dialog box was already popped up by
+             * "dfilter_report_bad_value()".
+             */
+            if (range_str != NULL)
+                g_free(range_str);
+            g_free(value_str);
+            return;
+        }
+        fvalue_free(fvalue);
+    } else {
+        value_str = NULL;
+        stripped_value_str = NULL;
+    }
+
+    /*
+     * Insert the expression at the current cursor position.
+     * If there's a non-whitespace character to the left of it,
+     * insert a blank first; if there's a non-whitespace character
+     * to the right of it, insert a blank after it.
+     */
+    pos = gtk_editable_get_position(GTK_EDITABLE(filter_te));
+    chars = gtk_editable_get_chars(GTK_EDITABLE(filter_te), pos, pos + 1);
+    if (strcmp(chars, "") != 0 && !isspace((unsigned char)chars[0]))
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
+    g_free(chars);
+
+    gtk_editable_insert_text(GTK_EDITABLE(filter_te), hfinfo->abbrev,
+                             strlen(hfinfo->abbrev), &pos);
+    if (range_str != NULL) {
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te), "[", 1, &pos);
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te),
+                                 stripped_range_str, strlen(stripped_range_str), &pos);
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te), "]", 1, &pos);
+        g_free(range_str);
+    }
+    if (item_str != NULL && !relation_is_presence_test(item_str)) {
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te), item_str,
+                                 strlen(item_str), &pos);
+    }
+    if (value_str != NULL) {
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
+        switch (hfinfo->type) {
+
+        case FT_STRING:
+        case FT_STRINGZ:
+        case FT_UINT_STRING:
+            /*
+             * Put quotes around the string.
+             */
+            gtk_editable_insert_text(GTK_EDITABLE(filter_te), "\"",
+                                     1, &pos);
+
+        default:
+            break;
+        }
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te),
+                                 stripped_value_str, strlen(stripped_value_str), &pos);
+        switch (hfinfo->type) {
+
+        case FT_STRING:
+        case FT_STRINGZ:
+        case FT_UINT_STRING:
+            /*
+             * Put quotes around the string.
+             */
+            gtk_editable_insert_text(GTK_EDITABLE(filter_te), "\"",
+                                     1, &pos);
+
+        default:
+            break;
+        }
+        g_free(value_str);
+    }
+    chars = gtk_editable_get_chars(GTK_EDITABLE(filter_te), pos + 1, pos + 2);
+    if (strcmp(chars, "") != 0 && !isspace((unsigned char)chars[0]))
+        gtk_editable_insert_text(GTK_EDITABLE(filter_te), " ", 1, &pos);
+    g_free(chars);
+
+    /*
+     * Put the cursor after the expression we just entered into
+     * the text entry widget.
+     */
+    gtk_editable_set_position(GTK_EDITABLE(filter_te), pos);
+
+    /*
+     * We're done; destroy the dialog box (which is the top-level
+     * widget for the "Accept" button).
+     */
+    gtk_widget_destroy(window);
+
+    g_free(item_str);
 }
 
 static void
 dfilter_expr_dlg_cancel_cb(GtkWidget *w _U_, gpointer parent_w)
 {
-	/*
-	 * User pressed the cancel button; close the dialog box.
-	 */
-	gtk_widget_destroy(GTK_WIDGET(parent_w));
+    /*
+     * User pressed the cancel button; close the dialog box.
+     */
+    gtk_widget_destroy(GTK_WIDGET(parent_w));
 }
 
 static void
 dfilter_expr_dlg_destroy_cb(GtkWidget *w, gpointer filter_te)
 {
-	/*
-	 * The dialog box is being destroyed; disconnect from the
-	 * "destroy" signal on the text entry box to which we're
-	 * attached, as the handler for that signal is supposed
-	 * to destroy us, but we're already gone.
-	 */
-        g_signal_handlers_disconnect_by_func(GTK_OBJECT(filter_te),
-                                             dfilter_expr_dlg_cancel_cb, w);
+    /*
+     * The dialog box is being destroyed; disconnect from the
+     * "destroy" signal on the text entry box to which we're
+     * attached, as the handler for that signal is supposed
+     * to destroy us, but we're already gone.
+     */
+    g_signal_handlers_disconnect_by_func(G_OBJECT(filter_te),
+                                         dfilter_expr_dlg_cancel_cb, w);
 }
 
 void
@@ -935,7 +943,8 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     GtkCellRenderer *renderer;
     GtkTreeViewColumn *column;
     GtkTreeIter iter;
-    gint col_offset;
+    GtkListStore      *l_store;
+    GtkTreeSelection  *l_sel;
 
     window = dlg_window_new("Ethereal: Filter Expression");
     gtk_container_set_border_width(GTK_CONTAINER(window), 5);
@@ -974,13 +983,11 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
     gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
     renderer = gtk_cell_renderer_text_new();
-    col_offset = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tree),
-                                                             -1, "Name", renderer,
-                                                             "text", 0, NULL);
-    column = gtk_tree_view_get_column(GTK_TREE_VIEW(tree),
-                                      col_offset - 1);
-    gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
-                                    GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    column = gtk_tree_view_column_new_with_attributes("Field name", renderer,
+                                                      "text", 0, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_sort_column_id(column, 0);
     g_signal_connect(G_OBJECT(selection), "changed",
                      G_CALLBACK(field_select_row_cb), tree);
     gtk_container_add(GTK_CONTAINER(tree_scrolled_win), tree);
@@ -994,10 +1001,17 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     gtk_misc_set_alignment(GTK_MISC(relation_label), 0.0, 0.0);
     gtk_box_pack_start(GTK_BOX(col2_vb), relation_label, FALSE, FALSE, 0);
 
-    relation_list = gtk_list_new();
+    l_store = gtk_list_store_new(1, G_TYPE_STRING);
+    relation_list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(l_store));
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(relation_list), FALSE);
+    g_object_unref(G_OBJECT(l_store));
+    renderer = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes("relation", renderer,
+                                                      "text", 0, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(relation_list), column);
+    l_sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list));
+    gtk_tree_selection_set_mode(l_sel, GTK_SELECTION_BROWSE);
     gtk_box_pack_start(GTK_BOX(col2_vb), relation_list, TRUE, TRUE, 0);
-    gtk_list_set_selection_mode(GTK_LIST(relation_list),
-                                GTK_SELECTION_BROWSE);
 
     range_label = gtk_label_new("Range (offset:length)");
     gtk_misc_set_alignment(GTK_MISC(range_label), 0.0, 0.0);
@@ -1046,21 +1060,28 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
                        TRUE, 0);
     gtk_widget_show(value_list_scrolled_win);
 
-    value_list = gtk_list_new();
-    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(value_list_scrolled_win),
-                                          value_list);
-    g_signal_connect(G_OBJECT(value_list), "select-child",
-                     G_CALLBACK(value_list_sel_cb), value_entry);
-    gtk_list_set_selection_mode(GTK_LIST(value_list), GTK_SELECTION_SINGLE);
-    /* This remains hidden until an enumerated field is selected */
-
+    l_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+    value_list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(l_store));
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(value_list), FALSE);
+    g_object_unref(G_OBJECT(l_store));
+    renderer = gtk_cell_renderer_text_new();
+    column = gtk_tree_view_column_new_with_attributes("value", renderer,
+                                                      "text", 0, NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(value_list), column);
+    g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(value_list))),
+                     "changed", G_CALLBACK(value_list_sel_cb), value_entry);
     /*
      * The value stuff may be hidden or shown depending on what
-     * relation was selected; connect to the "select-child" signal
+     * relation was selected; connect to the "changed" signal
      * for the relation list, so we can make that happen.
      */
-    g_signal_connect(G_OBJECT(relation_list), "select-child",
-                     G_CALLBACK(relation_list_sel_cb), NULL);
+    g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list))),
+                     "changed", G_CALLBACK(relation_list_sel_cb), NULL);
+    l_sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(value_list));
+    gtk_tree_selection_set_mode(l_sel, GTK_SELECTION_SINGLE);
+    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(value_list_scrolled_win),
+                                          value_list);
+    /* This remains hidden until an enumerated field is selected */
 
     /*
      * Put the items in the CTree; we don't want to do that until
@@ -1073,16 +1094,16 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
      */
 
     /* proto_array = g_array_new(FALSE, FALSE, sizeof(GtkTreeIter));
-    for (i = proto_get_first_protocol(&cookie); i != -1;
-         i = proto_get_next_protocol(&cookie)) {
-        hfinfo = proto_registrar_get_nth(i); */
-        /* Create a node for the protocol, and remember it for
-           later use. */
-        /* name = proto_get_protocol_short_name(i);
-        gtk_tree_store_append(store, &iter, NULL);
-        gtk_tree_store_set(store, &iter, 0, name, 1, hfinfo, -1);
-        g_array_append_val(proto_array, iter);
-    } */
+       for (i = proto_get_first_protocol(&cookie); i != -1;
+       i = proto_get_next_protocol(&cookie)) {
+       hfinfo = proto_registrar_get_nth(i); */
+    /* Create a node for the protocol, and remember it for
+       later use. */
+    /* name = proto_get_protocol_short_name(i);
+       gtk_tree_store_append(store, &iter, NULL);
+       gtk_tree_store_set(store, &iter, 0, name, 1, hfinfo, -1);
+       g_array_append_val(proto_array, iter);
+       } */
 
     len = proto_registrar_n();
     for (i = 0; i < len; i++) {