diff options
Diffstat (limited to 'linux.c')
| -rw-r--r-- | linux.c | 30 |
1 files changed, 12 insertions, 18 deletions
@@ -5,7 +5,7 @@ #include <gconf/gconf-client.h> #include <string.h> -#define DIVELIST_DEFAULT_FONT "Sans 8" +const char system_divelist_default_font[] = "Sans 8"; GConfClient *gconf; @@ -131,22 +131,18 @@ const char *subsurface_icon_name() return "subsurface.svg"; } -const char *subsurface_default_filename() +const char *system_default_filename(void) { - if (default_filename) { - return strdup(default_filename); - } else { - const char *home, *user; - char *buffer; - int len; - - home = g_get_home_dir(); - user = g_get_user_name(); - len = strlen(home) + strlen(user) + 17; - buffer = malloc(len); - snprintf(buffer, len, "%s/subsurface/%s.xml", home, user); - return buffer; - } + const char *home, *user; + char *buffer; + int len; + + home = g_get_home_dir(); + user = g_get_user_name(); + len = strlen(home) + strlen(user) + 17; + buffer = malloc(len); + snprintf(buffer, len, "%s/subsurface/%s.xml", home, user); + return buffer; } const char *subsurface_gettext_domainpath(char *argv0) @@ -163,8 +159,6 @@ const char *subsurface_gettext_domainpath(char *argv0) void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, GtkWidget *vbox, GtkUIManager *ui_manager) { - if (!divelist_font) - divelist_font = strdup(DIVELIST_DEFAULT_FONT); gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); } |