* Added preference file saves and reads.

svn path=/trunk/; revision=75

1 files changed, 4 insertions, 11 deletions

diff --git a/ethereal.c b/ethereal.c
index faec036d2f..fe12d4755b 100644
--- a/ethereal.c
+++ b/ethereal.c
@@ -1,6 +1,6 @@
 /* ethereal.c
  *
- * $Id: ethereal.c,v 1.8 1998/10/16 06:44:32 guy Exp $
+ * $Id: ethereal.c,v 1.9 1998/10/28 21:38:07 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -60,11 +60,11 @@
 #include "file.h"
 #include "menu.h"
 #include "etypes.h"
+#include "prefs.h"
 #include "print.h"
 #include "resolv.h"
 #include "follow.h"
 #include "util.h"
-#include "prefs.h"
 
 FILE        *data_out_file = NULL;
 packet_info  pi;
@@ -76,8 +76,6 @@ guint        main_ctx, file_ctx;
 frame_data  *fd;
 gint         start_capture = 0;
 
-extern pr_opts printer_opts;
-
 ts_type timestamp_type = RELATIVE;
 
 #define E_DFILTER_TE_KEY "display_filter_te"
@@ -387,6 +385,8 @@ main(int argc, char *argv[])
   cf.save_file = NULL;
   cf.snap      = 68;
   cf.count     = 0;
+
+  read_prefs();
     
   /* Let GTK get its args */
   gtk_init (&argc, &argv);
@@ -465,13 +465,6 @@ main(int argc, char *argv[])
   sprintf(rc_file, "%s/%s", getenv("HOME"), RC_FILE);
   gtk_rc_parse(rc_file);
 
-  /* initialize printer options. temporary! we should only initialize
-   * if the options are not set in some ethereal initialization file */
-  printer_opts.output_format = 0;
-  printer_opts.output_dest = 0;
-  printer_opts.file = g_strdup("ethereal.out");
-  printer_opts.cmd = g_strdup("lpr");
-
   if ((m_r_font = gdk_font_load(medium_font)) == NULL) {
     fprintf(stderr, "Error font %s not found (use -m option)\n", medium_font);
     exit(1);