diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-10-05 05:40:34 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-10-05 05:40:34 +0000 |
| commit | 6951f00068972589e779bb33070f3181caf499da (patch) | |
| tree | 6c418e8e56878ec7af193e64f97794956b6cbbb4 /gtk/capture_file_dlg.c | |
| parent | e18e2694c6b5529fc65ca06103e043540ca70595 (diff) | |
From Sake Blok and Michael Mann:
Change "File -> Save As" to only save the displayed frames by default.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6192
svn path=/trunk/; revision=39264
Diffstat (limited to 'gtk/capture_file_dlg.c')
| -rw-r--r-- | gtk/capture_file_dlg.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index e33333d701..11946d89e6 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -585,7 +585,7 @@ static void file_open_answered_cb(gpointer dialog _U_, gint btn, gpointer data) switch(btn) { case(ESD_BTN_SAVE): /* save file first */ - file_save_as_cmd(after_save_open_dialog, data); + file_save_as_cmd(after_save_open_dialog, data, FALSE); break; case(ESD_BTN_DONT_SAVE): cf_close(&cfile); @@ -893,7 +893,7 @@ static void file_merge_answered_cb(gpointer dialog _U_, gint btn, gpointer data switch(btn) { case(ESD_BTN_OK): /* save file first */ - file_save_as_cmd(after_save_merge_dialog, data); + file_save_as_cmd(after_save_merge_dialog, data, FALSE); break; case(ESD_BTN_CANCEL): break; @@ -1059,7 +1059,7 @@ static void file_close_answered_cb(gpointer dialog _U_, gint btn, gpointer data switch(btn) { case(ESD_BTN_SAVE): /* save file first */ - file_save_as_cmd(after_save_close_file, NULL); + file_save_as_cmd(after_save_close_file, NULL, FALSE); break; case(ESD_BTN_DONT_SAVE): cf_close(&cfile); @@ -1091,13 +1091,13 @@ file_close_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { } void -file_save_cmd_cb(GtkWidget *w, gpointer data) { +file_save_cmd_cb(GtkWidget *w _U_, gpointer data _U_) { /* If the file's already been saved, do nothing. */ if (cfile.user_saved) return; /* Do a "Save As". */ - file_save_as_cmd_cb(w, data); + file_save_as_cmd(after_save_no_action, NULL, FALSE); } static gboolean @@ -1179,7 +1179,7 @@ gpointer action_after_save_data_g; void -file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_save_data) +file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_save_data, gboolean save_only_displayed) { #if _WIN32 win32_save_as_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), action_after_save, action_after_save_data); @@ -1197,6 +1197,7 @@ file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_sa /* init the packet range */ packet_range_init(&range); + range.process_filtered = save_only_displayed; /* build the file selection */ file_save_as_w = file_selection_new ("Wireshark: Save Capture File As", @@ -1273,7 +1274,7 @@ file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_sa void file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_) { - file_save_as_cmd(after_save_no_action, NULL); + file_save_as_cmd(after_save_no_action, NULL, TRUE); } |