diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-25 06:42:34 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-25 06:42:34 +0000 |
| commit | beb43142767c06aa3afe72c75716369c2b72912d (patch) | |
| tree | cb78636348f64c2d3ff5796a37b925e1af0bdf5d /gtk/packet_list_store.c | |
| parent | 64ebe8caae621b2ea1cb0590d5d33b6a273e4a0f (diff) | |
Introduce "Show Resolved" as an option in custom columns. This will determine
if we show the value or the string representing the value.
This setting is not stored in the preferences file yet, and the option is
not available in the columns preferences window.
svn path=/trunk/; revision=33317
Diffstat (limited to 'gtk/packet_list_store.c')
| -rw-r--r-- | gtk/packet_list_store.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c index 426b75f778..1e4beda6a8 100644 --- a/gtk/packet_list_store.c +++ b/gtk/packet_list_store.c @@ -738,8 +738,12 @@ packet_list_change_record(PacketList *packet_list, guint row, gint col, column_i if(!packet_list->string_pool) packet_list->string_pool = g_string_chunk_new(32); - - str = g_string_chunk_insert_const (packet_list->string_pool, (const gchar *)cinfo->col_data[col]); + if (!get_column_resolved (col) && cinfo->col_expr.col_expr_val[col]) { + /* Use the unresolved value in col_expr_val */ + str = g_string_chunk_insert_const (packet_list->string_pool, (const gchar *)cinfo->col_expr.col_expr_val[col]); + } else { + str = g_string_chunk_insert_const (packet_list->string_pool, (const gchar *)cinfo->col_data[col]); + } record->fdata->col_text[col] = str; break; } |