diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-26 21:30:36 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-26 21:30:36 +0000 |
| commit | 59e35b0fbc0bff1a57a30b933eeacbfadb187b40 (patch) | |
| tree | 97c6bf315716c83f11c2369f4fad6462d7cecf95 /gtk | |
| parent | b444bd6eb2c82314b4386e0f444779ad4640186a (diff) | |
Always show packets with Time Reference (as in the old packet list).
Recreate visible rows when removing a Time Reference which has not passed
the display filter.
svn path=/trunk/; revision=33332
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main.c | 2 | ||||
| -rw-r--r-- | gtk/packet_list_store.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gtk/main.c b/gtk/main.c index bb802858a0..7bfd2ff18d 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -702,6 +702,8 @@ set_frame_reftime(gboolean set, frame_data *frame, gint row) { } cf_reftime_packets(&cfile); #ifdef NEW_PACKET_LIST + if (!frame->flags.ref_time && !frame->flags.passed_dfilter) + new_packet_list_recreate_visible_rows(); new_packet_list_queue_draw(); #endif } diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c index 1e4beda6a8..f5b6424d5f 100644 --- a/gtk/packet_list_store.c +++ b/gtk/packet_list_store.c @@ -620,7 +620,7 @@ packet_list_visible_record(PacketList *packet_list, GtkTreeIter *iter) g_return_val_if_fail(record, FALSE); g_return_val_if_fail(record->fdata, FALSE); - return record->fdata->flags.passed_dfilter; + return (record->fdata->flags.passed_dfilter || record->fdata->flags.passed_dfilter); } gint @@ -637,7 +637,7 @@ packet_list_append_record(PacketList *packet_list, frame_data *fdata) newrecord->fdata = fdata; newrecord->physical_pos = PACKET_LIST_RECORD_COUNT(packet_list->physical_rows); - if (newrecord->fdata->flags.passed_dfilter) { + if (fdata->flags.passed_dfilter || fdata->flags.ref_time) { newrecord->visible_pos = PACKET_LIST_RECORD_COUNT(packet_list->visible_rows); PACKET_LIST_RECORD_APPEND(packet_list->visible_rows, newrecord); } @@ -1019,7 +1019,7 @@ packet_list_resort(PacketList *packet_list) record->physical_pos = phy_idx; g_assert(record->visible_pos >= -1); if (record->visible_pos >= 0) { - g_assert(record->fdata->flags.passed_dfilter); + g_assert(record->fdata->flags.passed_dfilter || record->fdata->flags.ref_time); neworder[vis_idx] = record->visible_pos; PACKET_LIST_RECORD_SET(packet_list->visible_rows, vis_idx, record); record->visible_pos = vis_idx; @@ -1058,7 +1058,7 @@ packet_list_recreate_visible_rows(PacketList *packet_list) for(phy_idx = 0, vis_idx = 0; phy_idx < PACKET_LIST_RECORD_COUNT(packet_list->physical_rows); ++phy_idx) { record = PACKET_LIST_RECORD_GET(packet_list->physical_rows, phy_idx); - if (record->fdata->flags.passed_dfilter) { + if (record->fdata->flags.passed_dfilter || record->fdata->flags.ref_time) { record->visible_pos = vis_idx++; PACKET_LIST_RECORD_APPEND(packet_list->visible_rows, record); } |