Have separate callback mechanisms in file.c and capture.c; pass the

capture callbacks the capture_options * as its second argument in all
cases.  This makes it a bit clearer what arguments callbacks take, and
means we can get rid of all global_capture_opts references in
gtk/main_statusbar.c.

Put the interface between gtk/main.c and gtk/main_statusbar.c into a
private header.

svn path=/trunk/; revision=25576

1 files changed, 0 insertions, 13 deletions

diff --git a/file.h b/file.h
index 1979b3875a..c40854b7e3 100644
--- a/file.h
+++ b/file.h
@@ -60,16 +60,6 @@ typedef enum {
     cf_cb_file_closed,
     cf_cb_file_read_start,
     cf_cb_file_read_finished,
-#ifdef HAVE_LIBPCAP
-    cf_cb_live_capture_prepared,
-    cf_cb_live_capture_update_started,
-    cf_cb_live_capture_update_continue,
-    cf_cb_live_capture_update_finished,
-    cf_cb_live_capture_fixed_started,
-    cf_cb_live_capture_fixed_continue,
-    cf_cb_live_capture_fixed_finished,
-	cf_cb_live_capture_stopping,
-#endif
     cf_cb_packet_selected,
     cf_cb_packet_unselected,
     cf_cb_field_unselected,
@@ -82,9 +72,6 @@ typedef enum {
 typedef void (*cf_callback_t) (gint event, gpointer data, gpointer user_data);
 
 extern void
-cf_callback_invoke(int event, gpointer data);
-
-extern void
 cf_callback_add(cf_callback_t func, gpointer user_data);
 
 extern void