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, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index 8c0affb019..cf2524b969 100644
--- a/file.c
+++ b/file.c
@@ -135,9 +135,9 @@ typedef struct {
     gpointer user_data;
 } cf_callback_data_t;
 
-GList *cf_callbacks = NULL;
+static GList *cf_callbacks = NULL;
 
-void
+static void
 cf_callback_invoke(int event, gpointer data)
 {
     cf_callback_data_t *cb;