aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-06-27 09:02:51 -0700
committerGerald Combs <gerald@wireshark.org>2016-06-27 20:09:33 +0000
commitb0b2540fbaad26d282a6e335c2b800c056961514 (patch)
treec0e9423776123fb4957bec64d445f947ac07517b /ui
parentd8ddf84693f335a071982aac5896f86152e91ee5 (diff)
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 <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/capture_file.cpp9
1 files changed, 5 insertions, 4 deletions
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;
}
}