diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-06-03 20:39:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-06-03 20:39:45 +0000 |
| commit | bfb179ba467a0758bac5a6f7398586dfb3e45cde (patch) | |
| tree | 200bdfa814175952a638ca9af180cef9eb2cf4d5 /ui/gtk/stock_icons.c | |
| parent | 49ac36fd5967923ded246879141fa84155a5a69e (diff) | |
When allowing the user to save a capture file before closing it, if it's
a live capture:
have the dialog note that what's being saved are captured
packets;
have the dialog note that the capture will be stopped if you
close/quit;
actually stop the capture before saving the file or closing it.
This should fix bug 7318 (it appears to do so in my tests).
svn path=/trunk/; revision=43045
Diffstat (limited to 'ui/gtk/stock_icons.c')
| -rw-r--r-- | ui/gtk/stock_icons.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index fd3b48ee67..824fb23e7d 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -116,6 +116,9 @@ void stock_icons_init(void) { { WIRESHARK_STOCK_SAVE_ALL, "Save A_ll", 0, 0, NULL }, { WIRESHARK_STOCK_DONT_SAVE, "Continue _without Saving", 0, 0, NULL }, { WIRESHARK_STOCK_QUIT_DONT_SAVE, "Quit _without Saving", 0, 0, NULL }, + { WIRESHARK_STOCK_STOP_DONT_SAVE, "Stop and Continue _without Saving", 0, 0, NULL }, + { WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE, "Stop and Quit _without Saving", 0, 0, NULL }, + { WIRESHARK_STOCK_STOP_SAVE, "Stop and Save", 0, 0, NULL }, { WIRESHARK_STOCK_ABOUT, "_About", 0, 0, NULL }, { WIRESHARK_STOCK_COLORIZE, "_Colorize", 0, 0, NULL }, { WIRESHARK_STOCK_AUTOSCROLL, "_Auto Scroll", 0, 0, NULL }, @@ -255,7 +258,10 @@ void stock_icons_init(void) { icon_set = gtk_icon_factory_lookup_default(GTK_STOCK_CLEAR); gtk_icon_factory_add(factory, WIRESHARK_STOCK_DONT_SAVE, icon_set); gtk_icon_factory_add(factory, WIRESHARK_STOCK_QUIT_DONT_SAVE, icon_set); + gtk_icon_factory_add(factory, WIRESHARK_STOCK_STOP_DONT_SAVE, icon_set); + gtk_icon_factory_add(factory, WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE, icon_set); icon_set = gtk_icon_factory_lookup_default(GTK_STOCK_SAVE); + gtk_icon_factory_add(factory, WIRESHARK_STOCK_STOP_SAVE, icon_set); gtk_icon_factory_add(factory, WIRESHARK_STOCK_SAVE_ALL, icon_set); /* XXX: needs a better icon */ icon_set = gtk_icon_factory_lookup_default(GTK_STOCK_CLOSE); gtk_icon_factory_add(factory, WIRESHARK_STOCK_DISABLE, icon_set); |