Allow "capture info data" to not be a singleton.

[metze/wireshark/wip.git] / ui / gtk / gtkglobals.h

diff --git a/ui/gtk/gtkglobals.h b/ui/gtk/gtkglobals.h
index f4d4ab7ac47166b7ea7e211b7b01209bcbb1e776..e2fac873d73a2f02f6cb64e5fab9993a09e0abb0 100644 (file)
--- a/ui/gtk/gtkglobals.h
+++ b/ui/gtk/gtkglobals.h
@@ -1,8 +1,6 @@
 /* gtkglobals.h
  * GTK-related Global defines, etc.
  *
 /* gtkglobals.h
  * GTK-related Global defines, etc.
  *

- * $Id$
- *

  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs


@@ -19,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

  */
 
 #ifndef __GTKGLOBALS_H__
  */
 
 #ifndef __GTKGLOBALS_H__


@@ -39,6 +37,9 @@
  *  GTK global definitions. For example a pointer to the main application window.
  */
 
  *  GTK global definitions. For example a pointer to the main application window.
  */
 

+#include <capchild/capture_session.h>
+#include <capture_info.h>
+

 /** Application window. */
 extern GtkWidget *top_level;
 
 /** Application window. */
 extern GtkWidget *top_level;
 


@@ -51,7 +52,8 @@ extern GtkWidget *byte_nb_ptr_gbl;
 /** The filter text entry in the filter toolbar. */
 extern GtkWidget   *main_display_filter_widget;
 
 /** 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;
+extern capture_session global_capture_session;
+
+extern info_data_t global_info_data;

 
 #endif
 
 #endif