diff options
| author | Richard Wilson <rjw@netsurf-browser.org> | 2005-05-17 23:46:36 +0000 |
|---|---|---|
| committer | Richard Wilson <rjw@netsurf-browser.org> | 2005-05-17 23:46:36 +0000 |
| commit | d8608af81238608f800b489d5e8754b7b5bb7fca (patch) | |
| tree | 4b183dc31928c5a842bbaf636de154f60d15254f | |
| parent | 970248430612170d9446d2c06f69af63e31d4861 (diff) | |
| download | netsurf-d8608af81238608f800b489d5e8754b7b5bb7fca.tar.gz netsurf-d8608af81238608f800b489d5e8754b7b5bb7fca.tar.bz2 | |
[project @ 2005-05-17 23:46:36 by rjw]
Make long theme names work on old filesystems.
svn path=/import/netsurf/; revision=1726
| -rw-r--r-- | riscos/theme.c | 5 | ||||
| -rw-r--r-- | riscos/theme_install.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/riscos/theme.c b/riscos/theme.c index 7b34641be..aab6785d5 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -146,6 +146,11 @@ struct theme_descriptor *ro_gui_theme_find(const char *leafname) { descriptor = descriptor->next) if (!strcmp(leafname, descriptor->leafname)) return descriptor; + /* fallback for 10 chars on old filesystems */ + for (descriptor = theme_descriptors; descriptor; + descriptor = descriptor->next) + if (!strncmp(leafname, descriptor->leafname, 10)) + return descriptor; return NULL; } diff --git a/riscos/theme_install.c b/riscos/theme_install.c index 583e67c30..93ef0a97d 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -257,11 +257,10 @@ void theme_install_install(bool apply) warn_user("ThemeApplyErr", 0); } else { free(option_theme); - option_theme = theme_file; + option_theme = strdup(theme_install->leafname); } - } else { - free(theme_file); } + free(theme_file); } |