http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43283
User: guy
Date: 2012/06/16 11:17 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r43252 | guy | 2012-06-13 20:50:39 -0700 (Wed, 13 Jun 2012) | 6 lines
In effect, disable closing the main window while a capture is being
stopped - there's no guaranteed way to make the UI's close button
inactive (on X11, it depends on whether the window manager allows that),
but we can just do nothing and return TRUE from the delete event handler
to ignore the delete event.
------------------------------------------------------------------------
r43251 | guy | 2012-06-13 20:50:28 -0700 (Wed, 13 Jun 2012) | 3 lines
Re-enable the File -> Quit menu item when the capture stops (or is
started again).
------------------------------------------------------------------------
r43250 | guy | 2012-06-13 19:19:46 -0700 (Wed, 13 Jun 2012) | 5 lines
Disable some menu items and toolbar items while we're waiting for a
capture to stop, so that we don't try to quit while we're in the middle
of quitting or try to stop or restart the capture we're in the middle of
stopping.
------------------------------------------------------------------------
r43249 | guy | 2012-06-13 19:11:34 -0700 (Wed, 13 Jun 2012) | 2 lines
No pcap, no capture to stop.
------------------------------------------------------------------------
r43248 | guy | 2012-06-13 18:34:52 -0700 (Wed, 13 Jun 2012) | 5 lines
When stopping the capture before asking whether to save the results, run
the main loop until we're done reading the captured packets. Hopefully
this clears up bug 7318 in Evan Huus's case; I can't reproduce that
myself.
Directory: /trunk-1.8/ui/gtk/
Changes Path Action
+18 -3 capture_file_dlg.c Modified
+9 -0 capture_if_dlg.c Modified
+5 -1 capture_if_dlg.h Modified
+24 -0 main.c Modified
+25 -0 main_menubar.c Modified
+18 -0 main_toolbar.c Modified
+4 -0 main_toolbar.h Modified
+5 -0 menus.h Modified
