summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2013-05-25 22:46:27 +0100
committerVincent Sanders <vince@netsurf-browser.org>2013-05-28 14:16:10 +0100
commitee6e6eec050a38d9e795df86fa7a45ca313f8845 (patch)
treec9f2431d8865e7a0b6483912b1192a324600ec7e /gtk
parenta5355ec55721b6d874168d979338044c4a12dc52 (diff)
downloadnetsurf-ee6e6eec050a38d9e795df86fa7a45ca313f8845.tar.gz
netsurf-ee6e6eec050a38d9e795df86fa7a45ca313f8845.tar.bz2
move options include
Diffstat (limited to 'gtk')
-rw-r--r--gtk/completion.c2
-rw-r--r--gtk/dialogs/preferences.c2
-rw-r--r--gtk/dialogs/source.c2
-rw-r--r--gtk/download.c2
-rw-r--r--gtk/font_pango.c2
-rw-r--r--gtk/gui.c4
-rw-r--r--gtk/hotlist.c2
-rw-r--r--gtk/plotters.c2
-rw-r--r--gtk/print.c2
-rw-r--r--gtk/scaffolding.c2
-rw-r--r--gtk/system_colour.c2
-rw-r--r--gtk/tabs.c2
-rw-r--r--gtk/theme.c2
-rw-r--r--gtk/window.c2
14 files changed, 15 insertions, 15 deletions
diff --git a/gtk/completion.c b/gtk/completion.c
index d249db160..a0df08ad9 100644
--- a/gtk/completion.c
+++ b/gtk/completion.c
@@ -21,7 +21,7 @@
#include "content/urldb.h"
#include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
GtkListStore *nsgtk_completion_list;
diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c
index 2784eb7a1..430554caf 100644
--- a/gtk/dialogs/preferences.c
+++ b/gtk/dialogs/preferences.c
@@ -20,7 +20,7 @@
#include <math.h>
#include "desktop/browser_private.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "desktop/searchweb.h"
#include "utils/log.h"
#include "utils/utils.h"
diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c
index c50679066..ef4e36eb3 100644
--- a/gtk/dialogs/source.c
+++ b/gtk/dialogs/source.c
@@ -33,7 +33,7 @@
#include "desktop/browser_private.h"
#include "desktop/netsurf.h"
#include "desktop/print.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
diff --git a/gtk/download.c b/gtk/download.c
index 71b1aa633..e882ec798 100644
--- a/gtk/download.c
+++ b/gtk/download.c
@@ -30,7 +30,7 @@
#include "desktop/gui.h"
#include "gtk/gui.h"
#include "gtk/scaffolding.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "gtk/download.h"
#include "gtk/window.h"
#include "gtk/compat.h"
diff --git a/gtk/font_pango.c b/gtk/font_pango.c
index de115fa64..aa4fae319 100644
--- a/gtk/font_pango.c
+++ b/gtk/font_pango.c
@@ -34,7 +34,7 @@
#include "render/font.h"
#include "utils/utils.h"
#include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
static bool nsfont_width(const plot_font_style_t *fstyle,
const char *string, size_t length,
diff --git a/gtk/gui.c b/gtk/gui.c
index 832d79e6e..3408bb9ac 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -49,7 +49,7 @@
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
#include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf/pdf_plotters.h"
#include "desktop/searchweb.h"
@@ -241,7 +241,7 @@ nsgtk_init_glade(char **respath)
widWarning = GTK_WIDGET(gtk_builder_get_object(gladeWarning, "labelWarning"));
}
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
void gui_options_init_defaults(void)
{
char *hdir = getenv("HOME");
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index d7b5b9e8f..d249d3444 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -18,7 +18,7 @@
#include "desktop/hotlist.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
#include "gtk/gui.h"
diff --git a/gtk/plotters.c b/gtk/plotters.c
index 3af55b9d5..265061188 100644
--- a/gtk/plotters.c
+++ b/gtk/plotters.c
@@ -37,7 +37,7 @@
#include "gtk/plotters.h"
#include "gtk/scaffolding.h"
#include "render/font.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "gtk/bitmap.h"
GtkWidget *current_widget;
diff --git a/gtk/print.c b/gtk/print.c
index 02d89bbdb..68a96dc2d 100644
--- a/gtk/print.c
+++ b/gtk/print.c
@@ -33,7 +33,7 @@
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "desktop/plotters.h"
#include "desktop/print.h"
#include "desktop/printer.h"
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 5abda6276..01f7fe5c2 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -37,7 +37,7 @@
#include "desktop/hotlist.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "desktop/plotters.h"
#include "desktop/print.h"
#include "desktop/save_complete.h"
diff --git a/gtk/system_colour.c b/gtk/system_colour.c
index 6c1fd81b5..c136e50a0 100644
--- a/gtk/system_colour.c
+++ b/gtk/system_colour.c
@@ -24,7 +24,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
struct gui_system_colour_ctx {
const char *name;
diff --git a/gtk/tabs.c b/gtk/tabs.c
index e68a192ad..462f6668e 100644
--- a/gtk/tabs.c
+++ b/gtk/tabs.c
@@ -24,7 +24,7 @@
#include "gtk/gui.h"
#include "desktop/browser.h"
#include "content/content.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "desktop/search.h"
#include "utils/utils.h"
#include "gtk/search.h"
diff --git a/gtk/theme.c b/gtk/theme.c
index 402433c32..9d50c5931 100644
--- a/gtk/theme.c
+++ b/gtk/theme.c
@@ -31,7 +31,7 @@
#include "gtk/menu.h"
#include "gtk/theme.h"
#include "gtk/window.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "gtk/dialogs/preferences.h"
#include "utils/container.h"
#include "utils/log.h"
diff --git a/gtk/window.c b/gtk/window.c
index 557ea22eb..44b88d241 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -30,7 +30,7 @@
#include "gtk/window.h"
#include "desktop/browser_private.h"
#include "desktop/mouse.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "gtk/compat.h"