diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-22 18:13:57 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-22 18:13:57 +0000 |
| commit | b575db290214549280db5161edb80672dc1d30f1 (patch) | |
| tree | 6ed76bb965eb7a0eb524931a1bbbf576510f0da5 /gtk/toolbar.c | |
| parent | 4ce027a612e229d9a8cb146f64c0b6d885ea6882 (diff) | |
moved GTK specific parts from capture.c to ui_util.c,
implemented Win32 "Capture Stop" when using
"update list of packets in realtime" while capturing
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9777 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/toolbar.c')
| -rw-r--r-- | gtk/toolbar.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/gtk/toolbar.c b/gtk/toolbar.c index bf4da78a5b..c5c2f938c1 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -2,7 +2,7 @@ * The main toolbar * Copyright 2003, Ulf Lamping <ulf.lamping@web.de> * - * $Id: toolbar.c,v 1.25 2004/01/21 09:02:09 guy Exp $ + * $Id: toolbar.c,v 1.26 2004/01/22 18:13:57 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -257,14 +257,6 @@ void set_toolbar_for_capture_in_progress(gboolean capture_in_progress) { if (toolbar_init) { #ifdef HAVE_LIBPCAP gtk_widget_set_sensitive(new_button, !capture_in_progress); -#endif - gtk_widget_set_sensitive(open_button, !capture_in_progress); - -#ifdef HAVE_LIBPCAP - /* - * XXX - this doesn't yet work in Win32, as in the menus :-( - */ -#ifndef _WIN32 if (capture_in_progress) { gtk_widget_hide(new_button); gtk_widget_show(stop_button); @@ -272,10 +264,8 @@ void set_toolbar_for_capture_in_progress(gboolean capture_in_progress) { gtk_widget_show(new_button); gtk_widget_hide(stop_button); } -#else /* _WIN32 */ - gtk_widget_set_sensitive(new_button, !capture_in_progress); -#endif /* _WIN32 */ #endif /* HAVE_LIBPCAP */ + gtk_widget_set_sensitive(open_button, !capture_in_progress); } } @@ -380,10 +370,8 @@ toolbar_new(void) toolbar_item(new_button, window, main_tb, ETHEREAL_STOCK_CAPTURE_START, "Start a new live capture...", capture_24_xpm, capture_prep_cb); -#ifndef _WIN32 toolbar_item(stop_button, window, main_tb, GTK_STOCK_STOP, "Stop the running live capture", stock_stop_24_xpm, capture_stop_cb); -#endif /* _WIN32 */ toolbar_append_separator(main_tb); #endif /* HAVE_LIBPCAP */ |