aboutsummaryrefslogtreecommitdiffstats
path: root/epan/prefs.h
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2008-04-08 04:47:32 +0000
committerUlf Lamping <ulf.lamping@web.de>2008-04-08 04:47:32 +0000
commitdf724f83cd67956f05bd7cd925bb6ae385cf29c5 (patch)
tree130724337f6b5d2149f01fa8663a6a02bea2b206 /epan/prefs.h
parent578c25b88f23b5d534869b7cb1388627a368f17b (diff)
downloadwireshark-df724f83cd67956f05bd7cd925bb6ae385cf29c5.tar.gz
wireshark-df724f83cd67956f05bd7cd925bb6ae385cf29c5.tar.bz2
wireshark-df724f83cd67956f05bd7cd925bb6ae385cf29c5.zip
remove GTK1 specific font handling
svn path=/trunk/; revision=24842
Diffstat (limited to 'epan/prefs.h')
-rw-r--r--epan/prefs.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/epan/prefs.h b/epan/prefs.h
index 7bdf4fcc7f..f8419440be 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -41,14 +41,6 @@
#define RTP_PLAYER_DEFAULT_VISIBLE 4
-/* only GTK1 *or* GTK2 font_name should be used */
-/* (we need to keep both in the preferences file but will only use the one suitable for the programs GTK version 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.
@@ -122,8 +114,7 @@ typedef struct _e_prefs {
gint gui_ptree_expander_style;
gboolean gui_hex_dump_highlight_style;
gint gui_toolbar_main_style;
- gchar *gui_font_name1;
- gchar *gui_font_name2;
+ gchar *gui_font_name;
color_t gui_marked_fg;
color_t gui_marked_bg;
gchar *gui_colorized_fg;