diff options
author | Gerald Combs <gerald@wireshark.org> | 2018-01-24 15:52:49 -0800 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-01-25 05:26:10 +0000 |
commit | 686aad42e9d650fb321adf58b359dcd44675f8c3 (patch) | |
tree | b2139557c462532dd17d39bd1b90f72b7fe96a60 /wireshark-qt.cpp | |
parent | 55fbeec607013a681dbb0e60645dca6c89b8df80 (diff) |
Minor wireshark-qt.cpp cleanups.
Remove duplicate and unneeded code. Remove placeholder markers left over
from the initial port from GTK+.
Change-Id: I4b372057c40cce53d0a00a54e490dec2097a7423
Reviewed-on: https://code.wireshark.org/review/25462
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r-- | wireshark-qt.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 81ebd9ce6f..37aa0dbf97 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -835,33 +835,14 @@ int main(int argc, char *qt_argv[]) /* For update of WindowTitle (When use gui.window_title preference) */ main_w->setWSWindowTitle(); -//////// packet_list_enable_color(recent.packet_list_colorize); - g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: fetch recent color settings"); - packet_list_enable_color(TRUE); - -//////// - - -//////// if (!color_filters_init(&err_msg, color_filter_add_cb)) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); g_free(err_msg); } -//////// - -#ifdef HAVE_LIBPCAP - /* if the user didn't supply a capture filter, use the one to filter out remote connections like SSH */ - if (!global_commandline_info.start_capture && !global_capture_opts.default_options.cfilter) { - global_capture_opts.default_options.cfilter = g_strdup(get_conn_cfilter()); - } -#else /* HAVE_LIBPCAP */ - //////// -#endif /* HAVE_LIBPCAP */ - wsApp->allSystemsGo(); g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Wireshark is up and ready to go, elapsed time %.3fs\n", (float) (g_get_monotonic_time() - start_time) / 1000000); SimpleDialog::displayQueuedMessages(main_w); @@ -915,7 +896,6 @@ int main(int argc, char *qt_argv[]) g_free(s); } /* "-k" was specified; start a capture. */ -// show_main_window(FALSE); check_and_warn_user_startup(cf_name); /* If no user interfaces were specified on the command line, @@ -934,7 +914,7 @@ int main(int argc, char *qt_argv[]) start_requested_stats(); } } - /* if the user didn't supply a capture filter, use the one to filter out remote connections like SSH */ + /* if the user didn't supply a capture filter, use the one to filter out remote connections like SSH */ if (!global_commandline_info.start_capture && !global_capture_opts.default_options.cfilter) { global_capture_opts.default_options.cfilter = g_strdup(get_conn_cfilter()); } |