diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-22 13:40:28 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-22 13:40:28 +0000 |
commit | 49edba720fbbc73dbd1fa83311ae6ea098c3fae6 (patch) | |
tree | edaf2d1c670ffb8b02579c3cd29a5b61f99007ec /gtk | |
parent | b7f52ad6b5ac7f3de4e585b8ea93679b5ce1fdcf (diff) |
Check for custom column before using custom_field.
Store hidden columns correctly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33288 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/menus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/menus.c b/gtk/menus.c index 442e0c5ef8..c61a681315 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -3351,7 +3351,7 @@ rebuild_visible_columns_menu (void) GList *clp; fmt_data *cfmt; gchar *title; - gint i, col_id; + gint i, col_id, cur_fmt; menu_columns[0] = gtk_item_factory_get_widget(main_menu_factory, "/View/Displayed Columns"); menu_columns[1] = gtk_item_factory_get_widget(packet_list_heading_factory, "/Displayed Columns"); @@ -3364,7 +3364,8 @@ rebuild_visible_columns_menu (void) col_id = 0; while (clp) { cfmt = (fmt_data *) clp->data; - if (cfmt->custom_field) { + cur_fmt = get_column_format_from_str(cfmt->fmt); + if (cur_fmt == COL_CUSTOM) { title = g_strdup_printf ("%s (%s)", cfmt->title, cfmt->custom_field); } else { title = g_strdup_printf ("%s (%s)", cfmt->title, col_format_desc(cfile.cinfo.col_fmt[col_id])); |