diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-08 19:00:54 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-08 19:00:54 +0000 |
| commit | de23d92163d8739d69b082f0439cc3222ad7330e (patch) | |
| tree | 152350763a021e176f3d14346e8b8f81920e0763 /gtk | |
| parent | 1ad55d8c02a242fd879492d98e7e3e5acd7dcc0e (diff) | |
Add an option to col_fill_in() to allow us to disable column expression processing. This is rarely needed. It's only needed when the user right clicks on the packet list view to generate a display filter.
svn path=/trunk/; revision=29806
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main.c | 2 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 4 | ||||
| -rw-r--r-- | gtk/packet_list_store.c | 4 | ||||
| -rw-r--r-- | gtk/packet_win.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gtk/main.c b/gtk/main.c index 3cab4f65db..472e7c728c 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -526,7 +526,7 @@ get_filter_from_packet_list_row_and_column(gpointer data) epan_dissect_run(&edt, &cfile.pseudo_header, cfile.pd, fdata, &cfile.cinfo); - epan_dissect_fill_in_columns(&edt, TRUE); + epan_dissect_fill_in_columns(&edt, TRUE, TRUE); if (strlen(cfile.cinfo.col_expr.col_expr[column]) != 0 && strlen(cfile.cinfo.col_expr.col_expr_val[column]) != 0) { diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 7e61217f77..c0f22591fb 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -642,7 +642,7 @@ show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer, g_assert(fdata->col_text); if (col_based_on_frame_data(&cfile.cinfo, col_num)) { - col_fill_in_frame_data(fdata, &cfile.cinfo, col_num); + col_fill_in_frame_data(fdata, &cfile.cinfo, col_num, FALSE); cell_text = cfile.cinfo.col_data[col_num]; }else cell_text = fdata->col_text[col_num]; @@ -757,7 +757,7 @@ static gboolean get_col_text_from_record( PacketListRecord *record, gint col_num, gchar** cell_text){ if (col_based_on_frame_data(&cfile.cinfo, col_num)) { - col_fill_in_frame_data(record->fdata, &cfile.cinfo, col_num); + col_fill_in_frame_data(record->fdata, &cfile.cinfo, col_num, FALSE); *cell_text = g_strdup(cfile.cinfo.col_data[col_num]); }else *cell_text = g_strdup(record->fdata->col_text[col_num]); diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c index 3cf041f3b5..7fe7954830 100644 --- a/gtk/packet_list_store.c +++ b/gtk/packet_list_store.c @@ -1085,7 +1085,7 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord * if (dissect_columns) { /* "Stringify" non frame_data vals */ - epan_dissect_fill_in_columns(&edt, FALSE /* fill_fd_colums */); + epan_dissect_fill_in_columns(&edt, FALSE, FALSE /* fill_fd_colums */); for(col = 0; col < cinfo->num_cols; ++col) { /* Skip columns based om frame_data because we already store those. */ @@ -1216,7 +1216,7 @@ packet_list_get_widest_column_string(PacketList *packet_list, gint col) } } - col_fill_in_frame_data(&fdata, &cfile.cinfo, col); + col_fill_in_frame_data(&fdata, &cfile.cinfo, col, FALSE); return cfile.cinfo.col_buf[col]; } diff --git a/gtk/packet_win.c b/gtk/packet_win.c index e2865b7934..7a8a6a8a5b 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -141,7 +141,7 @@ void new_window_cb(GtkWidget *w _U_) DataPtr->edt = epan_dissect_new(TRUE, TRUE); epan_dissect_run(DataPtr->edt, &DataPtr->pseudo_header, DataPtr->pd, DataPtr->frame, &cfile.cinfo); - epan_dissect_fill_in_columns(DataPtr->edt, TRUE); + epan_dissect_fill_in_columns(DataPtr->edt, FALSE, TRUE); /* * Build title of window by getting column data constructed when the |