Do as the comment says - move the variable to gtkglobals.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38791 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/globals.h b/globals.h
index 5bb8718b6731b305adc6ad517f447b0035ab0722..7e3e526ecd9c91f693056725507c29174eedce4e 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -33,8 +33,6 @@ extern "C" {
 #include <epan/timestamp.h>
 
 extern capture_file cfile;
-/** @todo move this to the gtk dir */
-extern gboolean     auto_scroll_live;
 
 #ifdef __cplusplus
 }

diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h
index 152e0f2144aea862a53d1d7ee2cf3f56de9dc9e0..f4d4ab7ac47166b7ea7e211b7b01209bcbb1e776 100644 (file)
--- a/gtk/gtkglobals.h
+++ b/gtk/gtkglobals.h
@@ -51,4 +51,7 @@ extern GtkWidget *byte_nb_ptr_gbl;
 /** The filter text entry in the filter toolbar. */
 extern GtkWidget   *main_display_filter_widget;
 
+/** If autoscroll in live captures is active or not */
+extern gboolean     auto_scroll_live;
+
 #endif