Note that for THE3GPP_IPV6_DNS_SERVERS we probably *do* need to handle

[obnox/wireshark/wip.git] / prefs.h

diff --git a/prefs.h b/prefs.h
index bfac8f25cd1eef16e59a7d07d9334317e1406c6e..70111028dadd52305ca2996b5c13fd129edfcd86 100644 (file)
--- a/prefs.h
+++ b/prefs.h
@@ -1,7 +1,7 @@
 /* prefs.h
  * Definitions for preference handling routines
  *
- * $Id: prefs.h,v 1.52 2003/12/28 21:10:26 sharpe Exp $
+ * $Id: prefs.h,v 1.56 2004/02/01 20:28:10 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,6 +37,13 @@
 
 #define MAX_VAL_LEN  1024
 
+/* only GTK1 *or* GTK2 font_name should be used */
+#if GTK_MAJOR_VERSION < 2
+#define PREFS_GUI_FONT_NAME gui_font_name1
+#else
+#define PREFS_GUI_FONT_NAME gui_font_name2
+#endif
+
 /*
  * Convert a string listing name resolution types to a bitmask of
  * those types.
@@ -74,21 +81,17 @@ typedef struct _e_prefs {
   gint     gui_ptree_line_style;
   gint     gui_ptree_expander_style;
   gboolean gui_hex_dump_highlight_style;
-  gboolean gui_toolbar_main_show;
   gint     gui_toolbar_main_style;
-  gchar   *gui_font_name;
+  gchar   *gui_font_name1;
+  gchar   *gui_font_name2;
   color_t  gui_marked_fg;
   color_t  gui_marked_bg;
   gboolean gui_geometry_save_position;
   gboolean gui_geometry_save_size;
-  gint     gui_geometry_main_x;
-  gint     gui_geometry_main_y;
-  gint     gui_geometry_main_width;
-  gint     gui_geometry_main_height;
-  guint     gui_fileopen_style;
-  gint     gui_recent_files_count_max;
+  gboolean gui_geometry_save_maximized;
+  guint    gui_fileopen_style;
+  guint    gui_recent_files_count_max;
   gchar           *gui_fileopen_dir;
-  gchar    *gui_fileopen_remembered_dir;
   guint32  name_resolve;
   gint     name_resolve_concurrency;
   gchar   *capture_device;