diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-06-06 08:59:23 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-06-06 09:01:38 +0100 |
commit | 76a68d7dd02f3819e4e60cd9febfd45e20821e14 (patch) | |
tree | a86fc61314fd53d383cb95a313a2897779984214 /frontends/gtk | |
parent | d923e109cd56c553c8e87cdb8bdab5085e68cc73 (diff) | |
download | netsurf-76a68d7dd02f3819e4e60cd9febfd45e20821e14.tar.gz netsurf-76a68d7dd02f3819e4e60cd9febfd45e20821e14.tar.bz2 |
Update content to split public and internal API
Diffstat (limited to 'frontends/gtk')
-rw-r--r-- | frontends/gtk/bitmap.c | 4 | ||||
-rw-r--r-- | frontends/gtk/scaffolding.c | 5 | ||||
-rw-r--r-- | frontends/gtk/viewsource.c | 3 | ||||
-rw-r--r-- | frontends/gtk/window.c | 14 |
4 files changed, 15 insertions, 11 deletions
diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c index 1def140b8..b42814295 100644 --- a/frontends/gtk/bitmap.c +++ b/frontends/gtk/bitmap.c @@ -31,8 +31,8 @@ #include <gtk/gtk.h> #include "utils/utils.h" -#include "utils/log.h" -#include "content/content.h" +#include "utils/errors.h" +#include "netsurf/content.h" #include "netsurf/bitmap.h" #include "netsurf/plotters.h" diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c index 38dfd2125..dc0595a37 100644 --- a/frontends/gtk/scaffolding.c +++ b/frontends/gtk/scaffolding.c @@ -23,6 +23,7 @@ #include <errno.h> #include <stdlib.h> #include <unistd.h> +#include <string.h> #include <gtk/gtk.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -33,6 +34,8 @@ #include "utils/log.h" #include "utils/nsoption.h" #include "utils/file.h" +#include "utils/nsurl.h" +#include "netsurf/content.h" #include "desktop/browser_history.h" #include "netsurf/browser_window.h" #include "desktop/hotlist.h" @@ -46,7 +49,7 @@ #include "desktop/save_text.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" -#include "content/hlcache.h" +#include "desktop/search.h" #include "gtk/compat.h" #include "gtk/warn.h" diff --git a/frontends/gtk/viewsource.c b/frontends/gtk/viewsource.c index b0907a3a5..acf81018d 100644 --- a/frontends/gtk/viewsource.c +++ b/frontends/gtk/viewsource.c @@ -17,6 +17,7 @@ */ #include <stdlib.h> +#include <string.h> #include <gtk/gtk.h> #include "utils/utils.h" @@ -24,7 +25,7 @@ #include "utils/nsurl.h" #include "utils/messages.h" #include "netsurf/browser_window.h" -#include "content/content.h" +#include "netsurf/content.h" #include "gtk/viewdata.h" #include "gtk/viewsource.h" diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c index dd713cb28..a98d529c2 100644 --- a/frontends/gtk/window.c +++ b/frontends/gtk/window.c @@ -36,17 +36,17 @@ #include "utils/utf8.h" #include "utils/utils.h" #include "utils/nsoption.h" -#include "content/hlcache.h" -#include "gtk/window.h" -#include "gtk/selection.h" +#include "netsurf/content.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" -#include "desktop/searchweb.h" -#include "desktop/textinput.h" #include "netsurf/window.h" #include "netsurf/plotters.h" +#include "desktop/searchweb.h" +#include "desktop/textinput.h" #include "render/form.h" +#include "gtk/window.h" +#include "gtk/selection.h" #include "gtk/warn.h" #include "gtk/compat.h" #include "gtk/gui.h" @@ -947,7 +947,7 @@ static void gui_window_destroy(struct gui_window *g) * \param gw gtk gui window to set favicon on. * \param icon A handle to the new favicon content. */ -static void gui_window_set_icon(struct gui_window *gw, hlcache_handle *icon) +static void gui_window_set_icon(struct gui_window *gw, struct hlcache_handle *icon) { struct bitmap *icon_bitmap = NULL; @@ -1277,7 +1277,7 @@ static void gui_window_create_form_select_menu(struct gui_window *g, static void gui_window_file_gadget_open(struct gui_window *g, - hlcache_handle *hl, + struct hlcache_handle *hl, struct form_control *gadget) { GtkWidget *dialog; |