From Stas Grabois: make the previous change not to show disabled

protocols in the "Add Expression" and "Decode As" dialogs work with GTK+
2.x.

svn path=/trunk/; revision=11626

1 files changed, 7 insertions, 2 deletions

diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index f7c9eaa941..32dd1ec28d 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -1399,12 +1399,17 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
     gchar *name;
 
     for (i = proto_get_first_protocol(&cookie); i != -1;
-         i = proto_get_next_protocol(&cookie)) {
+	 i = proto_get_next_protocol(&cookie)) {
 	char *strp, str[TAG_STRING_LEN+1];
 
-	hfinfo = proto_registrar_get_nth(i);
         protocol = find_protocol_by_id(i);
+
+	if (!proto_is_protocol_enabled(protocol)) {
+	    continue;
+	}
+
 	name = proto_get_protocol_short_name(protocol); /* name, short_name or filter name ? */
+	hfinfo = proto_registrar_get_nth(i);
 
 	gtk_tree_store_append(store, &iter, NULL);
 	gtk_tree_store_set(store, &iter, 0, name, 1, hfinfo, -1);