From b0b2540fbaad26d282a6e335c2b800c056961514 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 27 Jun 2016 09:02:51 -0700 Subject: Qt: Clean up capture file callbacks. Mark some callbacks GTK+ only as appropriate. Change a debug message to an assert since we handle all callbacks. Change-Id: I4266f0d7134d19a9c0432354ea36de67501275b4 Reviewed-on: https://code.wireshark.org/review/16171 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- ui/qt/capture_file.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ui/qt/capture_file.cpp') diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp index 77f83fb05c..2df533ea75 100644 --- a/ui/qt/capture_file.cpp +++ b/ui/qt/capture_file.cpp @@ -215,13 +215,14 @@ void CaptureFile::captureFileEvent(int event, gpointer data) break; case(cf_cb_file_fast_save_finished): - // Ignored for now + // gtk/main.c calls main_cf_cb_file_rescan_finished. Should we do + // the equivalent? break; case(cf_cb_packet_selected): case(cf_cb_packet_unselected): case(cf_cb_field_unselected): - // Signals and slots handled elsewhere. + // GTK+ only. Handled in Qt via signals and slots. break; case(cf_cb_file_save_started): @@ -244,12 +245,12 @@ void CaptureFile::captureFileEvent(int event, gpointer data) case cf_cb_file_export_specified_packets_finished: case cf_cb_file_export_specified_packets_failed: case cf_cb_file_export_specified_packets_stopped: - // Ignored for now + // GTK+ only. break; default: - g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: main_cf_callback %d %p", event, data); g_warning("CaptureFile::captureFileCallback: event %u unknown", event); + g_assert_not_reached(); break; } } -- cgit v1.2.1