diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-11-27 13:15:41 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-11-27 13:15:41 +0000 |
| commit | a68334bcecfb10f30757c80c0aeeaf5ad4db6913 (patch) | |
| tree | dff39faa6e76a020d35c170864295ad898c0c3bb /gtk | |
| parent | 6bcb851e062529ce2fa1a85667a0e1a929ae5a81 (diff) | |
Prefix tooltip with protocol name.
svn path=/trunk/; revision=31094
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main_packet_list.c | 7 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c index fcf0afe996..ef40edfd81 100644 --- a/gtk/main_packet_list.c +++ b/gtk/main_packet_list.c @@ -687,7 +687,12 @@ packet_list_set_column_titles(void) GTK_SHRINK, GTK_SHRINK, 0, 0); if (cfile.cinfo.col_fmt[i] == COL_CUSTOM) { hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[i]); - tooltip_text = g_strdup_printf("%s (%s)", hfi->name, hfi->abbrev); + if (hfi->parent != -1) { + /* Prefix with protocol name */ + tooltip_text = g_strdup_printf("%s\n%s (%s)", proto_get_protocol_name(hfi->parent), hfi->name, hfi->abbrev); + } else { + tooltip_text = g_strdup_printf("%s (%s)", hfi->name, hfi->abbrev); + } } else { tooltip_text = g_strdup(col_format_desc(cfile.cinfo.col_fmt[i])); } diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 44d1f99800..531635304f 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -365,7 +365,12 @@ create_view_and_model(void) title_lb = gtk_label_new(cfile.cinfo.col_title[i]); if (cfile.cinfo.col_fmt[i] == COL_CUSTOM) { hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[i]); - tooltip_text = g_strdup_printf("%s (%s)", hfi->name, hfi->abbrev); + if (hfi->parent != -1) { + /* Prefix with protocol name */ + tooltip_text = g_strdup_printf("%s\n%s (%s)", proto_get_protocol_name(hfi->parent), hfi->name, hfi->abbrev); + } else { + tooltip_text = g_strdup_printf("%s (%s)", hfi->name, hfi->abbrev); + } } else { tooltip_text = g_strdup(col_format_desc(cfile.cinfo.col_fmt[i])); } |