diff options
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index a15232e782..0d8b53fc61 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -2980,19 +2980,15 @@ pre_init_prefs(void) /* We try to find the best font in the Qt code */ if (prefs.gui_qt_font_name) g_free(prefs.gui_qt_font_name); prefs.gui_qt_font_name = g_strdup(""); - prefs.gui_marked_fg.pixel = 65535; prefs.gui_marked_fg.red = 65535; prefs.gui_marked_fg.green = 65535; prefs.gui_marked_fg.blue = 65535; - prefs.gui_marked_bg.pixel = 0; prefs.gui_marked_bg.red = 0; prefs.gui_marked_bg.green = 8224; prefs.gui_marked_bg.blue = 10794; - prefs.gui_ignored_fg.pixel = 32767; prefs.gui_ignored_fg.red = 32767; prefs.gui_ignored_fg.green = 32767; prefs.gui_ignored_fg.blue = 32767; - prefs.gui_ignored_bg.pixel = 65535; prefs.gui_ignored_bg.red = 65535; prefs.gui_ignored_bg.green = 65535; prefs.gui_ignored_bg.blue = 65535; @@ -3000,32 +2996,25 @@ pre_init_prefs(void) prefs.gui_colorized_fg = g_strdup("000000,000000,000000,000000,000000,000000,000000,000000,000000,000000"); if (prefs.gui_colorized_bg) g_free(prefs.gui_colorized_bg); prefs.gui_colorized_bg = g_strdup("ffc0c0,ffc0ff,e0c0e0,c0c0ff,c0e0e0,c0ffff,c0ffc0,ffffc0,e0e0c0,e0e0e0"); - prefs.st_client_fg.pixel = 0; prefs.st_client_fg.red = 32767; prefs.st_client_fg.green = 0; prefs.st_client_fg.blue = 0; - prefs.st_client_bg.pixel = 0; prefs.st_client_bg.red = 64507; prefs.st_client_bg.green = 60909; prefs.st_client_bg.blue = 60909; - prefs.st_server_fg.pixel = 0; prefs.st_server_fg.red = 0; prefs.st_server_fg.green = 0; prefs.st_server_fg.blue = 32767; - prefs.st_server_bg.pixel = 0; prefs.st_server_bg.red = 60909; prefs.st_server_bg.green = 60909; prefs.st_server_bg.blue = 64507; - prefs.gui_text_valid.pixel = 0; /* light green */ - prefs.gui_text_valid.red = 0xAFFF; - prefs.gui_text_valid.green = 0xFFFF; - prefs.gui_text_valid.blue = 0xAFFF; - prefs.gui_text_invalid.pixel = 0; /* light red */ - prefs.gui_text_invalid.red = 0xFFFF; + prefs.gui_text_valid.red = 0xAFFF; /* light green */ + prefs.gui_text_valid.green = 0xFFFF; + prefs.gui_text_valid.blue = 0xAFFF; + prefs.gui_text_invalid.red = 0xFFFF; /* light red */ prefs.gui_text_invalid.green = 0xAFFF; prefs.gui_text_invalid.blue = 0xAFFF; - prefs.gui_text_deprecated.pixel = 0; /* light yellow */ - prefs.gui_text_deprecated.red = 0xFFFF; + prefs.gui_text_deprecated.red = 0xFFFF; /* light yellow */ prefs.gui_text_deprecated.green = 0xFFFF; prefs.gui_text_deprecated.blue = 0xAFFF; prefs.gui_geometry_save_position = TRUE; @@ -4438,7 +4427,6 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data _U_, case PREF_COLOR: { cval = strtoul(value, NULL, 16); - pref->varp.colorp->pixel = 0; if ((pref->varp.colorp->red != RED_COMPONENT(cval)) || (pref->varp.colorp->green != GREEN_COMPONENT(cval)) || (pref->varp.colorp->blue != BLUE_COMPONENT(cval))) { |