diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-08-06 14:11:46 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-08-06 14:11:46 +0000 |
| commit | c77c787122c06036a8faf0a8f4d26e47782a0b00 (patch) | |
| tree | 6f10b789abf34ec41f210894b9d3760221f759d9 /gtk/capture_file_dlg.c | |
| parent | a8ddad6d914a98dbfa497d6a12ffa5ff893881ef (diff) | |
| download | wireshark-c77c787122c06036a8faf0a8f4d26e47782a0b00.tar.gz | |
Merge files chronologically by default which:
- makes (much) more sense to me
- makes the GUI's default behavior the same as mergecap's
For whatever reason the default behavior was to append the new file
/if transport resolution was enabled/ (not sure what those two things have to
do with each other).
svn path=/trunk/; revision=25947
Diffstat (limited to 'gtk/capture_file_dlg.c')
| -rw-r--r-- | gtk/capture_file_dlg.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index f1ac9988eb..c99fbe2552 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -835,8 +835,6 @@ file_merge_cmd(GtkWidget *w) gtk_tooltips_set_tip(tooltips, append_rb, "The resulting file contains the packets from the currently loaded, followed by the packets from the selected file," " the packet timestamps will be ignored.", NULL); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(append_rb), - g_resolv_flags & RESOLV_TRANSPORT); gtk_box_pack_start(GTK_BOX(main_vb), append_rb, FALSE, FALSE, 0); gtk_widget_show(append_rb); g_object_set_data(G_OBJECT(file_merge_w), E_MERGE_APPEND_KEY, append_rb); |