aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-09-09 03:35:32 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-09-09 03:35:32 +0000
commitfee5f126ffb23aceb287e38c15ec9a854c000a3d (patch)
tree257df8af9c93e4735183a5c29899771816b10032
parent8617c58f3ca2b782992be793185127bb7d9e8bff (diff)
I forgot to include this file move in my last commit.
svn path=/trunk/; revision=637
-rw-r--r--gtk/filter_prefs.c (renamed from filter.c)17
-rw-r--r--gtk/filter_prefs.h (renamed from filter.h)12
2 files changed, 15 insertions, 14 deletions
diff --git a/filter.c b/gtk/filter_prefs.c
index 50a4cc46d7..a9214b8538 100644
--- a/filter.c
+++ b/gtk/filter_prefs.c
@@ -1,7 +1,7 @@
/* filter.c
* Routines for managing filter sets
*
- * $Id: filter.c,v 1.16 1999/09/09 02:42:25 gram Exp $
+ * $Id: filter_prefs.c,v 1.1 1999/09/09 03:35:31 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -41,15 +41,26 @@
#endif
#include "gtk/main.h"
-#include "filter.h"
+#include "filter_prefs.h"
#include "packet.h"
#include "file.h"
-#include "prefs.h"
+#include "prefs_dlg.h"
#define E_FILT_NAME_KEY "filter_name"
#define E_FILT_LBL_KEY "filter_label"
#define E_FILT_CM_KEY "in_cancel_mode"
+typedef struct _filter_def {
+ char *name;
+ char *strval;
+} filter_def;
+
+typedef struct _filter_cb_data {
+ GList *fl;
+ GtkWidget *win;
+} filter_cb_data;
+
+
GtkWidget *filter_l, *chg_bt, *copy_bt, *del_bt, *name_te, *filter_te;
GList *fl = NULL;
diff --git a/filter.h b/gtk/filter_prefs.h
index 23fbe661a4..450a444738 100644
--- a/filter.h
+++ b/gtk/filter_prefs.h
@@ -1,7 +1,7 @@
/* filter.h
* Definitions for packet filter window
*
- * $Id: filter.h,v 1.4 1998/10/13 02:10:55 gerald Exp $
+ * $Id: filter_prefs.h,v 1.1 1999/09/09 03:35:32 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -26,16 +26,6 @@
#ifndef __FILTER_H__
#define __FILTER_H__
-typedef struct _filter_def {
- char *name;
- char *strval;
-} filter_def;
-
-typedef struct _filter_cb_data {
- GList *fl;
- GtkWidget *win;
-} filter_cb_data;
-
GtkWidget *filter_prefs_show(GtkWidget *);
void filter_sel_list_cb(GtkWidget *, gpointer);
void filter_sel_new_cb(GtkWidget *, gpointer);