From dcb663e4073500030f86dcdc2643da16b4064ed5 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Wed, 20 Jun 2018 21:45:53 +0200 Subject: [PATCH] Revert "cleanup: remove empty function" This broke our hook to plumb in our usb open function into libusb, so this broke ftdi based downloads. This reverts commit e4530cd5ef38e6120f451daf1a758b38b70a6f1c. Signed-off-by: Anton Lundin --- core/linux.c | 5 +++++ core/pref.h | 1 + core/subsurfacestartup.c | 1 + 3 files changed, 7 insertions(+) diff --git a/core/linux.c b/core/linux.c index 446bbeaa1..b8d88e9e5 100644 --- a/core/linux.c +++ b/core/linux.c @@ -20,6 +20,11 @@ const char linux_system_divelist_default_font[] = "Sans"; const char *system_divelist_default_font = linux_system_divelist_default_font; double system_divelist_default_font_size = -1.0; +void subsurface_OS_pref_setup(void) +{ + // nothing +} + bool subsurface_ignore_font(const char *font) { // there are no old default fonts to ignore diff --git a/core/pref.h b/core/pref.h index 8ca763ce8..6eae3aae5 100644 --- a/core/pref.h +++ b/core/pref.h @@ -190,6 +190,7 @@ extern double system_divelist_default_font_size; extern const char *system_default_directory(void); extern const char *system_default_filename(); extern bool subsurface_ignore_font(const char *font); +extern void subsurface_OS_pref_setup(); extern void copy_prefs(struct preferences *src, struct preferences *dest); #ifdef __cplusplus diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c index 65b30e7d6..508fda73c 100644 --- a/core/subsurfacestartup.c +++ b/core/subsurfacestartup.c @@ -284,6 +284,7 @@ void setup_system_prefs(void) { const char *env; + subsurface_OS_pref_setup(); default_prefs.divelist_font = strdup(system_divelist_default_font); default_prefs.font_size = system_divelist_default_font_size;