From 1490b52a6b96b6a69a0c4fe9e0515dc717425128 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 22 Mar 2012 09:34:34 +0000 Subject: NetSurf options rework (a=vince r=daniels,jmb) svn path=/trunk/netsurf/; revision=13548 --- riscos/theme_install.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'riscos/theme_install.c') diff --git a/riscos/theme_install.c b/riscos/theme_install.c index 574a380d4..e5d5aafa3 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -28,7 +28,7 @@ #include "desktop/browser.h" #include "riscos/dialog.h" #include "riscos/gui.h" -#include "riscos/options.h" +#include "desktop/options.h" #include "riscos/theme.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" @@ -198,7 +198,7 @@ bool ro_gui_theme_install_apply(wimp_w w) /* simply overwrite previous theme versions */ snprintf(theme_save, sizeof theme_save, "%s.%s", - option_theme_save, theme_file); + nsoption_charp(theme_save), theme_file); theme_save[sizeof theme_save - 1] = '\0'; @@ -222,8 +222,7 @@ bool ro_gui_theme_install_apply(wimp_w w) if (!theme_install || !ro_gui_theme_apply(theme_install)) { warn_user("ThemeApplyErr", 0); } else { - free(option_theme); - option_theme = strdup(theme_install->leafname); + nsoption_set_charp(theme, strdup(theme_install->leafname)); } free(theme_file); ro_gui_save_options(); -- cgit v1.2.3