osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move GTK-related stuff out of globals.h and put it in gtk/gtkglobals.h 

svn path=/trunk/; revision=896
This commit is contained in:
Gilbert Ramirez 1999-10-20 22:36:05 +00:00
parent 32a4854f3e
commit b0cfa34169
4 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
capture.c
View File

@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
* $Id: capture.c,v 1.79 1999/10/02 19:57:23 guy Exp $
* $Id: capture.c,v 1.80 1999/10/20 22:35:57 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -80,6 +80,7 @@
#endif
#include "gtk/main.h"
#include "gtk/gtkglobals.h"
#include "packet.h"
#include "file.h"
#include "gtk/menu.h"

12
globals.h
View File

@ -1,7 +1,7 @@
/* globals.h
* Global defines, etc.
*
* $Id: globals.h,v 1.10 1999/10/02 19:24:19 guy Exp $
* $Id: globals.h,v 1.11 1999/10/20 22:35:57 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -34,10 +34,6 @@
#include "packet.h"
#endif
#ifndef __GTK_H__
#include <gtk/gtk.h>
#endif
#ifndef __PRINT_H__
#include "print.h"
#endif
@ -85,9 +81,9 @@
extern FILE *data_out_file;
extern packet_info pi;
extern capture_file cf;
extern GtkWidget *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar,
/*extern GtkWidget *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar,
*info_bar;
extern GdkFont *m_r_font, *m_b_font;
extern GdkFont *m_r_font, *m_b_font;*/
extern guint main_ctx, file_ctx;
extern gchar comp_info_str[256];
extern gchar *ethereal_path;
@ -99,7 +95,7 @@ extern int g_resolving_actif;
extern ts_type timestamp_type;
extern GtkStyle *item_style;
/*extern GtkStyle *item_style;*/
#define PF_DIR ".ethereal"

5
gtk/file_dlg.c
View File

@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
* $Id: file_dlg.c,v 1.10 1999/10/12 05:01:07 guy Exp $
* $Id: file_dlg.c,v 1.11 1999/10/20 22:36:05 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -40,6 +40,9 @@
#ifndef __GLOBALS_H__
#include "globals.h"
#endif
#ifndef __GTKGLOBALS_H__
#include "gtkglobals.h"
#endif
#ifndef __KEYS_H__
#include "keys.h"

39
gtk/gtkglobals.h Normal file
View File

@ -0,0 +1,39 @@
/* gtkglobals.h
* GTK-related Global defines, etc.
*
* $Id: gtkglobals.h,v 1.1 1999/10/20 22:36:05 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*/
#ifndef __GTKGLOBALS_H__
#define __GTKGLOBALS_H__
#ifndef __GTK_H__
#include <gtk/gtk.h>
#endif
extern GtkWidget *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar,
*info_bar;
extern GdkFont *m_r_font, *m_b_font;
extern GtkStyle *item_style;
#endif