aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/dfilter_expr_dlg.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-09-05 05:28:50 +0000
committerGuy Harris <guy@alum.mit.edu>2003-09-05 05:28:50 +0000
commita26f4d06823e0f558e64a4a7a6c60239d8e2d7e9 (patch)
tree07deec35e61071987c8c38ed820cb531456a7415 /gtk/dfilter_expr_dlg.c
parentfd37b02632b2cb36967b8c6d1c8f5982b02e9772 (diff)
If Belinda:
http://www.ethereal.com/lists/ethereal-dev/199910/msg00237.html isn't there, don't try to display her. svn path=/trunk/; revision=8385
Diffstat (limited to 'gtk/dfilter_expr_dlg.c')
-rw-r--r--gtk/dfilter_expr_dlg.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 7907fb1df3..d81c15b5e0 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/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.37 2003/09/05 03:32:24 sahlberg Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.38 2003/09/05 05:28:50 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1331,7 +1331,11 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
under its parent protocol. */
protocol_node = g_hash_table_lookup(proto_array,
GINT_TO_POINTER(proto_registrar_get_parent(i)));
- snprintf(str, 127, "%-30s %s (%s)", hfinfo->abbrev, hfinfo->name, hfinfo->blurb);
+ if (hfinfo->blurb != NULL && hfinfo->blurb[0] != '\0') {
+ snprintf(str, 127, "%-30s %s (%s)", hfinfo->abbrev, hfinfo->name,
+ hfinfo->blurb);
+ } else
+ snprintf(str, 127, "%-30s %s", hfinfo->abbrev, hfinfo->name);
str[127]=0;
strp=str;
item_node = gtk_ctree_insert_node(GTK_CTREE(tree),
@@ -1368,7 +1372,13 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
if (hfinfo->same_name_prev != NULL) /* ignore duplicate names */
continue;
- snprintf(str, 127, "%-30s %s (%s)", hfinfo->abbrev, hfinfo->name, hfinfo->blurb);
+ if (hfinfo->blurb != NULL && hfinfo->blurb[0] != '\0') {
+ snprintf(str, 127, "%-30s %s (%s)", hfinfo->abbrev,
+ hfinfo->name, hfinfo->blurb);
+ } else {
+ snprintf(str, 127, "%-30s %s", hfinfo->abbrev,
+ hfinfo->name);
+ }
str[127]=0;
strp=str;
gtk_tree_store_append(store, &child_iter, &iter);