diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-27 17:10:50 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-27 17:10:50 +0000 |
| commit | 0bdc0efc46ec66a298306aae253225c702ed6bea (patch) | |
| tree | 1d6db93f3252994330777f123cb3d038518080e9 /ui/gtk/main.c | |
| parent | b450609a5561db9ddfc23b41c742979f5c4b3a32 (diff) | |
get main_window_update out of the way... pass an update_cb to the capture_sync stuff
... as per the XXX comment removed from tshark.c this was a mess to keep the linker
happy... I couldn't!
I did this without even understanding whether calling main_window_update was realy
necessary in most cases. I guess nothing or more specific update cbs would be best.
svn path=/trunk/; revision=50188
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 981a316be8..49d7c0db87 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2293,7 +2293,7 @@ main(int argc, char *argv[]) break; case 'D': /* Print a list of capture devices and exit */ #ifdef HAVE_LIBPCAP - if_list = capture_interface_list(&err, &err_str); + if_list = capture_interface_list(&err, &err_str,main_window_update); if (if_list == NULL) { switch (err) { case CANT_GET_INTERFACE_LIST: @@ -2800,7 +2800,7 @@ main(int argc, char *argv[]) } #ifdef HAVE_LIBPCAP - fill_in_local_interfaces(); + fill_in_local_interfaces(main_window_update); if (start_capture && list_link_layer_types) { /* Specifying *both* is bogus. */ cmdarg_err("You can't specify both -L and a live capture."); @@ -2870,7 +2870,7 @@ main(int argc, char *argv[]) device = g_array_index(global_capture_opts.all_ifaces, interface_t, i); if (device.selected) { #if defined(HAVE_PCAP_CREATE) - caps = capture_get_if_capabilities(device.name, device.monitor_mode_supported, &err_str); + caps = capture_get_if_capabilities(device.name, device.monitor_mode_supported, &err_str, main_window_update); #else caps = capture_get_if_capabilities(device.name, FALSE, &err_str); #endif @@ -3133,7 +3133,7 @@ main(int argc, char *argv[]) to use for this capture. */ if (global_capture_opts.ifaces->len == 0) collect_ifaces(&global_capture_opts); - if (capture_start(&global_capture_opts, &global_capture_session)) { + if (capture_start(&global_capture_opts, &global_capture_session,main_window_update)) { /* The capture started. Open stat windows; we do so after creating the main window, to avoid GTK warnings, and after successfully opening the capture file, so we know we have something to compute |