Move the definition of "prefs" from "gtk/prefs_dlg.c" to "prefs.c", so

that you don't have to have "gtk/prefs_dlg.c" to get it defined - future
non-GTK (text mode, curses, etc.) programs wouldn't have it.

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

diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 0475b665918f22036184efdfd5527b0e6921fba7..66495b02766f08d768954898452e977a4e3594c1 100644 (file)
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
 /* prefs_dlg.c
  * Routines for handling preferences
  *

- * $Id: prefs_dlg.c,v 1.5 1999/12/16 06:20:18 gram Exp $
+ * $Id: prefs_dlg.c,v 1.6 1999/12/29 05:53:48 guy Exp $

  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>


@@ -55,8 +55,6 @@
 #include "gui_prefs.h"
 #include "util.h"
 
 #include "gui_prefs.h"
 #include "util.h"
 

-e_prefs prefs;
-

 static void     prefs_main_ok_cb(GtkWidget *, gpointer);
 static void     prefs_main_save_cb(GtkWidget *, gpointer);
 static void     prefs_main_cancel_cb(GtkWidget *, gpointer);
 static void     prefs_main_ok_cb(GtkWidget *, gpointer);
 static void     prefs_main_save_cb(GtkWidget *, gpointer);
 static void     prefs_main_cancel_cb(GtkWidget *, gpointer);

diff --git a/prefs.c b/prefs.c
index 0d9eeb43a0f75e2a07849ac320830bc487591f89..81d79c125468d87407d1cb07fb3ffe6f1f91091c 100644 (file)
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
 /* prefs.c
  * Routines for handling preferences
  *
 /* prefs.c
  * Routines for handling preferences
  *

- * $Id: prefs.c,v 1.25 1999/12/16 06:19:50 gram Exp $
+ * $Id: prefs.c,v 1.26 1999/12/29 05:53:41 guy Exp $

  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>


@@ -63,6 +63,8 @@ static void   clear_string_list(GList *);
 static int init_prefs = 1;
 static gchar *pf_path = NULL;
 
 static int init_prefs = 1;
 static gchar *pf_path = NULL;
 

+e_prefs prefs;
+

 /* Parse through a list of comma-separated, quoted strings.  Return a
    list of the string data */
 static GList *
 /* Parse through a list of comma-separated, quoted strings.  Return a
    list of the string data */
 static GList *