diff options
| author | TingPing <tingping@tingping.se> | 2014-01-31 17:20:17 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-02-04 20:45:29 -0500 |
| commit | 3a7fb4d8e1896eced87e3ccbf9369d76fa10d7e0 (patch) | |
| tree | 444fe3085277bcc8a65f187991a874d0e794c0f6 /src/common/cfgfiles.c | |
| parent | 8e55157e6abc105ee17d80d91a291ca8e1215733 (diff) | |
osx: Set Menlo as default font
This moves the find_font function to the front ends since it depends on pango and cairo
Diffstat (limited to 'src/common/cfgfiles.c')
| -rw-r--r-- | src/common/cfgfiles.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index b7a8beda..68f4126e 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -731,7 +731,7 @@ get_default_spell_languages (void) void load_default_config(void) { - const char *username, *realname; + const char *username, *realname, *font; char *sp; #ifdef WIN32 char out[256]; @@ -891,21 +891,19 @@ load_default_config(void) strcpy (prefs.hex_irc_user_name, username); strcpy (prefs.hex_stamp_log_format, "%b %d %H:%M:%S "); strcpy (prefs.hex_stamp_text_format, "[%H:%M:%S] "); -#ifdef WIN32 - if (find_font ("Consolas")) + + font = fe_get_default_font (); + if (font) { - strcpy (prefs.hex_text_font, "Consolas 10"); - strcpy (prefs.hex_text_font_main, "Consolas 10"); + strcpy (prefs.hex_text_font, font); + strcpy (prefs.hex_text_font_main, font); } else { strcpy (prefs.hex_text_font, DEF_FONT); strcpy (prefs.hex_text_font_main, DEF_FONT); } -#else - strcpy (prefs.hex_text_font, DEF_FONT); - strcpy (prefs.hex_text_font_main, DEF_FONT); -#endif + strcpy (prefs.hex_text_font_alternative, DEF_FONT_ALTER); strcpy (prefs.hex_text_spell_langs, get_default_spell_languages ()); |