3 files changed, 35 insertions, 2 deletions
diff --git a/desktop/gui.h b/desktop/gui.h
index c80c56b4e..fcff4f382 100644
--- a/desktop/gui.h
+++ b/desktop/gui.h
@@ -1,5 +1,5 @@
 /**
- * $Id: gui.h,v 1.6 2003/03/04 11:59:35 bursa Exp $
+ * $Id: gui.h,v 1.7 2003/06/01 23:02:56 monkeyson Exp $
  */
 
 #ifndef _NETSURF_DESKTOP_GUI_H_
@@ -51,4 +51,7 @@ void gui_window_stop_throbber(gui_window* g);
 void gui_gadget_combo(struct browser_window* bw, struct gui_gadget* g, unsigned long mx, unsigned long my);
 void gui_edit_textarea(struct browser_window* bw, struct gui_gadget* g);
 void gui_edit_textbox(struct browser_window* bw, struct gui_gadget* g);
+
+void gui_show_choices();
+
 #endif
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index c28d96ad3..bc62c0de0 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -1,7 +1,8 @@
 /**
- * $Id: netsurf.c,v 1.8 2003/05/10 11:13:34 bursa Exp $
+ * $Id: netsurf.c,v 1.9 2003/06/01 23:02:56 monkeyson Exp $
  */
 
+#include "netsurf/desktop/options.h"
 #include "netsurf/desktop/netsurf.h"
 #include "netsurf/desktop/browser.h"
 #include "netsurf/desktop/gui.h"
@@ -27,6 +28,8 @@ void netsurf_poll(void)
 void netsurf_init(int argc, char** argv)
 {
   stdout = stderr;
+  options_init(&OPTIONS);
+  options_read(&OPTIONS, NULL);
   gui_init(argc, argv);
   fetch_init();
   cache_init();
diff --git a/desktop/options.h b/desktop/options.h
new file mode 100644
index 000000000..c3ca7031c
--- /dev/null
+++ b/desktop/options.h
@@ -0,0 +1,27 @@
+
+#ifndef _NETSURF_DESKTOP_OPTIONS_H_
+#define _NETSURF_DESKTOP_OPTIONS_H_
+
+struct options;
+
+#include "netsurf/riscos/options.h"
+
+struct options
+{
+	/* global options */
+	int http;
+	char* http_proxy;
+	int http_port;
+	
+	/* platform specific options */
+	PLATFORM_OPTIONS
+};
+
+extern struct options OPTIONS;
+
+void options_init(struct options* opt);
+void options_write(struct options*, char* filename);
+void options_read(struct options*, char* filename);
+
+#endif
+