From 745deb7a9d4bf26a6339a297c3c06bb12f5cc102 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 8 Jan 2006 01:51:33 +0000
Subject: [project @ 2006-01-08 01:51:33 by jmb] Make data file locations
 user-configurable (no UI for this as yet) Reduce intrusiveness of ncos
 modifications Fix GTK build Remove Cookies file details from Messages (this
 data never belonged in there anyway) Make gui_init more robust against memory
 exhaustion.

svn path=/import/netsurf/; revision=2014
---
 !NetSurf/!Run,feb              |  8 +++++++-
 !NetSurf/Resources/de/Messages | 11 -----------
 !NetSurf/Resources/en/Messages | 11 -----------
 !NetSurf/Resources/fr/Messages | 11 -----------
 !NetSurf/Resources/nl/Messages | 11 -----------
 5 files changed, 7 insertions(+), 45 deletions(-)

(limited to '!NetSurf')

diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb
index c259f818f..cf809c4b4 100644
--- a/!NetSurf/!Run,feb
+++ b/!NetSurf/!Run,feb
@@ -1,4 +1,4 @@
-| Run file for NetSurf. ( $Revision: 1.44 $ )
+| Run file for NetSurf. ( $Revision: 1.45 $ )
 |
 | This file ensures that the system resources required by NetSurf are 
 | present. Additionally, it forces setting of system variables related
@@ -9,6 +9,12 @@ Set NetSurf$ForceVars 1
 <Obey$Dir>.!Boot
 UnSet NetSurf$ForceVars
 
+| Resource Locations
+| The following are read-only locations
+SetMacro NetSurf$Path        Choices:WWW.NetSurf.,<NetSurf$Dir>.
+| The following are write-only locations
+SetMacro NetSurf$ChoicesSave <Choices$Write>.WWW.NetSurf.Choices
+
 | We need RISC OS 3
 RMEnsure UtilityModule 3.00 Error NetSurf needs RISC OS 3 or later
 
diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages
index cb509a7f3..3c62f3b44 100644
--- a/!NetSurf/Resources/de/Messages
+++ b/!NetSurf/Resources/de/Messages
@@ -340,17 +340,6 @@ Encoding2:from <meta>
 EncodingUnk:Unknown
 
 
-# Cookies
-# =======
-#
-# Cookies related tokens.
-#
-# At present, this section simply stores the location of
-# the cookie file. This should not be changed.
-#
-cookiefile:Choices:WWW.NetSurf.Cookies
-cookiejar:<Choices$Write>.WWW.NetSurf.Cookies
-
 # Errors
 # ======
 #
diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages
index 8c6b6dcae..ef84d79dd 100644
--- a/!NetSurf/Resources/en/Messages
+++ b/!NetSurf/Resources/en/Messages
@@ -340,17 +340,6 @@ Encoding2:from <meta>
 EncodingUnk:Unknown
 
 
-# Cookies
-# =======
-#
-# Cookies related tokens.
-#
-# At present, this section simply stores the location of
-# the cookie file. This should not be changed.
-#
-cookiefile:Choices:WWW.NetSurf.Cookies
-cookiejar:<Choices$Write>.WWW.NetSurf.Cookies
-
 # Errors
 # ======
 #
diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages
index 581c137da..75b83a73a 100644
--- a/!NetSurf/Resources/fr/Messages
+++ b/!NetSurf/Resources/fr/Messages
@@ -340,17 +340,6 @@ Encoding2:de <meta>
 EncodingUnk:Inconnu
 
 
-# Cookies
-# =======
-#
-# Cookies related tokens.
-#
-# At present, this section simply stores the location of
-# the cookie file. This should not be changed.
-#
-cookiefile:Choices:WWW.NetSurf.Cookies
-cookiejar:<Choices$Write>.WWW.NetSurf.Cookies
-
 # Errors
 # ======
 #
diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages
index 59b7ac15e..60e23980e 100644
--- a/!NetSurf/Resources/nl/Messages
+++ b/!NetSurf/Resources/nl/Messages
@@ -341,17 +341,6 @@ Encoding2:from <meta>
 EncodingUnk:Unknown
 
 
-# Cookies
-# =======
-#
-# Cookies related tokens.
-#
-# At present, this section simply stores the location of
-# the cookie file. This should not be changed.
-#
-cookiefile:Choices:WWW.NetSurf.Cookies
-cookiejar:<Choices$Write>.WWW.NetSurf.Cookies
-
 # Errors
 # ======
 #
-- 
cgit v1.2.3