diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-12-11 09:34:08 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-12-20 08:21:02 +0000 |
| commit | 9bb3f6be4c18822267a64633c298e1a8f1809221 (patch) | |
| tree | de9b8934c58f239e29d0227039ad7f55f3d42f06 /ui/gtk/main_menubar.c | |
| parent | 7e0ec2c8eb3c88e70992dc40b130c76177b83a30 (diff) | |
Qt: Add missing multi-field column validation
GTK already has it, but Qt forgot about it, so multi-field custom column
works ok if previously saved in GTK-shark. Invalid validation prevent from
modifying and saving multi-field custom column in Qt version.
While at it, rename "custom field" to "custom fields" to ensure
we think about multi-field custom column.
Change-Id: I99588150ccb38be11b75f5dd5b0f6443e7055ebb
Reviewed-on: https://code.wireshark.org/review/12685
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/main_menubar.c')
| -rw-r--r-- | ui/gtk/main_menubar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 8d089fe66c..4edfa5140f 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -5117,13 +5117,13 @@ rebuild_visible_columns_menu (void) cfmt = (fmt_data *) clp->data; if (cfmt->title[0]) { if (cfmt->fmt == COL_CUSTOM) { - title = g_strdup_printf ("%s (%s)", cfmt->title, cfmt->custom_field); + title = g_strdup_printf ("%s (%s)", cfmt->title, cfmt->custom_fields); } else { title = g_strdup_printf ("%s (%s)", cfmt->title, col_format_desc (cfmt->fmt)); } } else { if (cfmt->fmt == COL_CUSTOM) { - title = g_strdup_printf ("(%s)", cfmt->custom_field); + title = g_strdup_printf ("(%s)", cfmt->custom_fields); } else { title = g_strdup_printf ("(%s)", col_format_desc (cfmt->fmt)); } |