diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-04-05 13:01:45 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-04-05 20:02:20 +0000 |
| commit | fd510bef347d643f1a360ccd578f2cf19f5a855c (patch) | |
| tree | 59a90332cb000003cbfdeca9f20c6b270f5cca37 /ui/gtk/main.c | |
| parent | afe9b9bbaf01011aa42effdddf7d4637729d50c1 (diff) | |
Give the welcome screen its own set of callbacks.
Don't have the status bar code know about the welcome screen; instead,
give the welcome screen its own callbacks, so that it can modify the
welcome screen as appropriate.
Change-Id: Id38d66edeaea085f114b47d6361312450435b58a
Reviewed-on: https://code.wireshark.org/review/7927
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index d1aa6ab832..6b73413230 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -170,6 +170,7 @@ #include "ui/gtk/main_toolbar.h" #include "ui/gtk/main_toolbar_private.h" #include "ui/gtk/main_welcome.h" +#include "ui/gtk/main_welcome_private.h" #include "ui/gtk/drag_and_drop.h" #include "ui/gtk/capture_file_dlg.h" #include "ui/gtk/packet_panes.h" @@ -2445,11 +2446,17 @@ DIAG_ON(cast-qual) #ifdef HAVE_LIBPCAP capture_callback_add(main_capture_callback, NULL); #endif + cf_callback_add(statusbar_cf_callback, NULL); #ifdef HAVE_LIBPCAP capture_callback_add(statusbar_capture_callback, NULL); #endif + cf_callback_add(welcome_cf_callback, NULL); +#ifdef HAVE_LIBPCAP + capture_callback_add(welcome_capture_callback, NULL); +#endif + set_console_log_handler(); #ifdef HAVE_LIBPCAP |