diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/font_pango.c | 14 | ||||
-rw-r--r-- | gtk/gtk_bitmap.c | 10 | ||||
-rw-r--r-- | gtk/gtk_bitmap.h | 2 | ||||
-rw-r--r-- | gtk/gtk_completion.c | 8 | ||||
-rw-r--r-- | gtk/gtk_filetype.c | 8 | ||||
-rw-r--r-- | gtk/gtk_gui.c | 48 | ||||
-rw-r--r-- | gtk/gtk_history.c | 10 | ||||
-rw-r--r-- | gtk/gtk_login.c | 20 | ||||
-rw-r--r-- | gtk/gtk_options.c | 14 | ||||
-rw-r--r-- | gtk/gtk_plotters.c | 18 | ||||
-rw-r--r-- | gtk/gtk_scaffolding.c | 50 | ||||
-rw-r--r-- | gtk/gtk_scaffolding.h | 4 | ||||
-rw-r--r-- | gtk/gtk_schedule.c | 2 | ||||
-rw-r--r-- | gtk/gtk_throbber.c | 8 | ||||
-rw-r--r-- | gtk/gtk_thumbnail.c | 20 | ||||
-rw-r--r-- | gtk/gtk_treeview.c | 2 | ||||
-rw-r--r-- | gtk/gtk_window.c | 18 | ||||
-rw-r--r-- | gtk/gtk_window.h | 4 | ||||
-rw-r--r-- | gtk/options.h | 2 |
19 files changed, 131 insertions, 131 deletions
diff --git a/gtk/font_pango.c b/gtk/font_pango.c index a100745d7..b03bfd79a 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -15,13 +15,13 @@ #include <assert.h> #include <stdio.h> #include <gtk/gtk.h> -#include "netsurf/css/css.h" -#include "netsurf/gtk/font_pango.h" -#include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/render/font.h" -#include "netsurf/utils/utils.h" -#include "netsurf/utils/log.h" -#include "netsurf/desktop/options.h" +#include "css/css.h" +#include "gtk/font_pango.h" +#include "gtk/gtk_plotters.h" +#include "render/font.h" +#include "utils/utils.h" +#include "utils/log.h" +#include "desktop/options.h" /* Until we can consider the descenders etc, we need to not render using cairo */ #undef CAIRO_VERSION diff --git a/gtk/gtk_bitmap.c b/gtk/gtk_bitmap.c index dda8b7659..67a3db332 100644 --- a/gtk/gtk_bitmap.c +++ b/gtk/gtk_bitmap.c @@ -16,11 +16,11 @@ #include <string.h> #include <gdk/gdk.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include "netsurf/content/content.h" -#include "netsurf/gtk/gtk_bitmap.h" -#include "netsurf/gtk/gtk_scaffolding.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/utils/log.h" +#include "content/content.h" +#include "gtk/gtk_bitmap.h" +#include "gtk/gtk_scaffolding.h" +#include "image/bitmap.h" +#include "utils/log.h" struct bitmap { diff --git a/gtk/gtk_bitmap.h b/gtk/gtk_bitmap.h index 61a800b5d..edbeb75fb 100644 --- a/gtk/gtk_bitmap.h +++ b/gtk/gtk_bitmap.h @@ -10,7 +10,7 @@ #include <gdk/gdk.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include "netsurf/image/bitmap.h" +#include "image/bitmap.h" GdkPixbuf *gtk_bitmap_get_primary(struct bitmap*); GdkPixbuf *gtk_bitmap_get_pretile_x(struct bitmap*); diff --git a/gtk/gtk_completion.c b/gtk/gtk_completion.c index dd6aa086f..4dbe41eca 100644 --- a/gtk/gtk_completion.c +++ b/gtk/gtk_completion.c @@ -6,10 +6,10 @@ */ #include <gtk/gtk.h> -#include "netsurf/gtk/gtk_completion.h" -#include "netsurf/content/urldb.h" -#include "netsurf/utils/log.h" -#include "netsurf/desktop/options.h" +#include "gtk/gtk_completion.h" +#include "content/urldb.h" +#include "utils/log.h" +#include "desktop/options.h" GtkListStore *nsgtk_completion_list; diff --git a/gtk/gtk_filetype.c b/gtk/gtk_filetype.c index 667129e05..f34aa0bcd 100644 --- a/gtk/gtk_filetype.c +++ b/gtk/gtk_filetype.c @@ -15,10 +15,10 @@ #include <sys/stat.h> #include <unistd.h> -#include "netsurf/gtk/gtk_filetype.h" -#include "netsurf/content/fetch.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/hashtable.h" +#include "gtk/gtk_filetype.h" +#include "content/fetch.h" +#include "utils/log.h" +#include "utils/hashtable.h" static struct hash_table *mime_hash = NULL; diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index a2c98b9c5..1aef14472 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -20,30 +20,30 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <glade/glade.h> -#include "netsurf/content/content.h" -#include "netsurf/content/fetch.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/401login.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/cookies.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/desktop/options.h" -#include "netsurf/gtk/gtk_gui.h" -#include "netsurf/gtk/gtk_options.h" -#include "netsurf/gtk/gtk_completion.h" -#include "netsurf/gtk/options.h" -#include "netsurf/gtk/gtk_throbber.h" -#include "netsurf/gtk/gtk_history.h" -#include "netsurf/gtk/gtk_filetype.h" -#include "netsurf/render/box.h" -#include "netsurf/render/form.h" -#include "netsurf/render/html.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utf8.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "content/fetch.h" +#include "content/urldb.h" +#include "desktop/401login.h" +#include "desktop/browser.h" +#include "desktop/cookies.h" +#include "desktop/gui.h" +#include "desktop/netsurf.h" +#include "desktop/options.h" +#include "gtk/gtk_gui.h" +#include "gtk/gtk_options.h" +#include "gtk/gtk_completion.h" +#include "gtk/options.h" +#include "gtk/gtk_throbber.h" +#include "gtk/gtk_history.h" +#include "gtk/gtk_filetype.h" +#include "render/box.h" +#include "render/form.h" +#include "render/html.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utf8.h" +#include "utils/utils.h" /* Where to search for shared resources. Must have trailing / */ #define RESPATH "/usr/share/netsurf/" diff --git a/gtk/gtk_history.c b/gtk/gtk_history.c index a7b75ef1f..72f41538a 100644 --- a/gtk/gtk_history.c +++ b/gtk/gtk_history.c @@ -7,11 +7,11 @@ #include <gtk/gtk.h> #include <glade/glade.h> -#include "netsurf/utils/log.h" -#include "netsurf/content/urldb.h" -#include "netsurf/gtk/gtk_history.h" -#include "netsurf/gtk/gtk_gui.h" -#include "netsurf/gtk/gtk_window.h" +#include "utils/log.h" +#include "content/urldb.h" +#include "gtk/gtk_history.h" +#include "gtk/gtk_gui.h" +#include "gtk/gtk_window.h" enum { diff --git a/gtk/gtk_login.c b/gtk/gtk_login.c index 176fc1339..c3b558d55 100644 --- a/gtk/gtk_login.c +++ b/gtk/gtk_login.c @@ -11,16 +11,16 @@ #include <assert.h> #include <gtk/gtk.h> #include <glade/glade.h> -#include "netsurf/utils/log.h" -#include "netsurf/gtk/gtk_gui.h" -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/401login.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "gtk/gtk_gui.h" +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/browser.h" +#include "desktop/401login.h" +#include "desktop/gui.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" struct session_401 { char *url; /**< URL being fetched */ diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c index 820e1828c..5bc6644aa 100644 --- a/gtk/gtk_options.c +++ b/gtk/gtk_options.c @@ -10,13 +10,13 @@ #include <string.h> #include <gtk/gtk.h> #include <glade/glade.h> -#include "netsurf/utils/log.h" -#include "netsurf/desktop/options.h" -#include "netsurf/gtk/options.h" -#include "netsurf/gtk/gtk_gui.h" -#include "netsurf/gtk/gtk_scaffolding.h" -#include "netsurf/gtk/gtk_options.h" -#include "netsurf/gtk/gtk_window.h" +#include "utils/log.h" +#include "desktop/options.h" +#include "gtk/options.h" +#include "gtk/gtk_gui.h" +#include "gtk/gtk_scaffolding.h" +#include "gtk/gtk_options.h" +#include "gtk/gtk_window.h" GtkWindow *wndChoices; diff --git a/gtk/gtk_plotters.c b/gtk/gtk_plotters.c index dee34336c..4162e3909 100644 --- a/gtk/gtk_plotters.c +++ b/gtk/gtk_plotters.c @@ -18,15 +18,15 @@ #include <math.h> #include <gdk/gdk.h> #include <gtk/gtk.h> -#include "netsurf/desktop/plotters.h" -#include "netsurf/gtk/font_pango.h" -#include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/gtk/gtk_scaffolding.h" -#include "netsurf/render/font.h" -#include "netsurf/utils/log.h" -#include "netsurf/desktop/options.h" -#include "netsurf/gtk/options.h" -#include "netsurf/gtk/gtk_bitmap.h" +#include "desktop/plotters.h" +#include "gtk/font_pango.h" +#include "gtk/gtk_plotters.h" +#include "gtk/gtk_scaffolding.h" +#include "render/font.h" +#include "utils/log.h" +#include "desktop/options.h" +#include "gtk/options.h" +#include "gtk/gtk_bitmap.h" GtkWidget *current_widget; GdkDrawable *current_drawable; diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c index b1fe5c779..2ba9139f1 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/gtk_scaffolding.c @@ -12,32 +12,32 @@ #include <string.h> #include <gtk/gtk.h> #include <glade/glade.h> -#include "netsurf/content/content.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/history_core.h" -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/netsurf.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/desktop/options.h" -#include "netsurf/desktop/textinput.h" -#include "netsurf/desktop/gesture_core.h" -#include "netsurf/gtk/gtk_gui.h" -#include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/gtk/gtk_scaffolding.h" -#include "netsurf/gtk/gtk_options.h" -#include "netsurf/gtk/gtk_completion.h" -#include "netsurf/gtk/gtk_throbber.h" -#include "netsurf/gtk/gtk_history.h" -#include "netsurf/gtk/gtk_window.h" -#include "netsurf/gtk/gtk_schedule.h" -#include "netsurf/render/box.h" -#include "netsurf/render/font.h" -#include "netsurf/render/form.h" -#include "netsurf/render/html.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/utils.h" +#include "content/content.h" +#include "desktop/browser.h" +#include "desktop/history_core.h" +#include "desktop/gui.h" +#include "desktop/netsurf.h" +#include "desktop/plotters.h" +#include "desktop/options.h" +#include "desktop/textinput.h" +#include "desktop/gesture_core.h" +#include "gtk/gtk_gui.h" +#include "gtk/gtk_plotters.h" +#include "gtk/gtk_scaffolding.h" +#include "gtk/gtk_options.h" +#include "gtk/gtk_completion.h" +#include "gtk/gtk_throbber.h" +#include "gtk/gtk_history.h" +#include "gtk/gtk_window.h" +#include "gtk/gtk_schedule.h" +#include "render/box.h" +#include "render/font.h" +#include "render/form.h" +#include "render/html.h" +#include "utils/messages.h" +#include "utils/utils.h" #undef NDEBUG -#include "netsurf/utils/log.h" +#include "utils/log.h" struct gtk_history_window; diff --git a/gtk/gtk_scaffolding.h b/gtk/gtk_scaffolding.h index d32b380fc..5f786d94f 100644 --- a/gtk/gtk_scaffolding.h +++ b/gtk/gtk_scaffolding.h @@ -9,8 +9,8 @@ #define NETSURF_GTK_SCAFFOLDING_H 1 #include <gtk/gtk.h> -#include "netsurf/desktop/gui.h" -#include "netsurf/desktop/plotters.h" +#include "desktop/gui.h" +#include "desktop/plotters.h" typedef struct gtk_scaffolding nsgtk_scaffolding; diff --git a/gtk/gtk_schedule.c b/gtk/gtk_schedule.c index 73568fa93..13eb54d7d 100644 --- a/gtk/gtk_schedule.c +++ b/gtk/gtk_schedule.c @@ -8,7 +8,7 @@ #include <glib.h> #include <stdlib.h> -#include "netsurf/desktop/browser.h" +#include "desktop/browser.h" typedef struct { void (*callback)(void *); diff --git a/gtk/gtk_throbber.c b/gtk/gtk_throbber.c index a95cf1609..49c546b4f 100644 --- a/gtk/gtk_throbber.c +++ b/gtk/gtk_throbber.c @@ -7,10 +7,10 @@ #include <stdio.h> #include <stdlib.h> -#include "netsurf/utils/log.h" -#include "netsurf/image/gifread.h" -#include "netsurf/gtk/gtk_throbber.h" -#include "netsurf/gtk/gtk_bitmap.h" +#include "utils/log.h" +#include "image/gifread.h" +#include "gtk/gtk_throbber.h" +#include "gtk/gtk_bitmap.h" struct nsgtk_throbber *nsgtk_throbber = NULL; diff --git a/gtk/gtk_thumbnail.c b/gtk/gtk_thumbnail.c index 2209fcf3f..5c456e6f0 100644 --- a/gtk/gtk_thumbnail.c +++ b/gtk/gtk_thumbnail.c @@ -15,16 +15,16 @@ #include <assert.h> #include <gtk/gtk.h> -#include "netsurf/content/content.h" -#include "netsurf/content/urldb.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/image/bitmap.h" -#include "netsurf/render/font.h" -#include "netsurf/utils/log.h" -#include "netsurf/gtk/gtk_scaffolding.h" -#include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/gtk/gtk_bitmap.h" +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/plotters.h" +#include "desktop/browser.h" +#include "image/bitmap.h" +#include "render/font.h" +#include "utils/log.h" +#include "gtk/gtk_scaffolding.h" +#include "gtk/gtk_plotters.h" +#include "gtk/gtk_bitmap.h" /** * Create a thumbnail of a page. diff --git a/gtk/gtk_treeview.c b/gtk/gtk_treeview.c index 9b5f2c2c0..3fd32b840 100644 --- a/gtk/gtk_treeview.c +++ b/gtk/gtk_treeview.c @@ -10,7 +10,7 @@ */ -#include "netsurf/desktop/tree.h" +#include "desktop/tree.h" /** diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index 641ecbb55..baa2ba564 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -6,16 +6,16 @@ * Copyright 2006 Rob Kendrick <rjek@rjek.com> */ -#include "netsurf/gtk/gtk_window.h" -#include "netsurf/desktop/browser.h" -#include "netsurf/desktop/textinput.h" -#include "netsurf/gtk/gtk_gui.h" -#include "netsurf/gtk/gtk_scaffolding.h" -#include "netsurf/gtk/gtk_plotters.h" -#include "netsurf/gtk/gtk_schedule.h" +#include "gtk/gtk_window.h" +#include "desktop/browser.h" +#include "desktop/textinput.h" +#include "gtk/gtk_gui.h" +#include "gtk/gtk_scaffolding.h" +#include "gtk/gtk_plotters.h" +#include "gtk/gtk_schedule.h" #undef NDEBUG -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "utils/utils.h" #include <gdk/gdkkeysyms.h> #include <assert.h> diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h index 24aa5cd74..3afe04d15 100644 --- a/gtk/gtk_window.h +++ b/gtk/gtk_window.h @@ -8,8 +8,8 @@ #ifndef NETSURF_GTK_WINDOW_H #define NETSURF_GTK_WINDOW_H 1 -#include "netsurf/desktop/gui.h" -#include "netsurf/gtk/gtk_scaffolding.h" +#include "desktop/gui.h" +#include "gtk/gtk_scaffolding.h" void nsgtk_window_reflow_content(struct gui_window *g); void nsgtk_reflow_all_windows(void); diff --git a/gtk/options.h b/gtk/options.h index 545be330d..71aef4c9d 100644 --- a/gtk/options.h +++ b/gtk/options.h @@ -8,7 +8,7 @@ #ifndef _NETSURF_GTK_OPTIONS_H_ #define _NETSURF_GTK_OPTIONS_H_ -#include "netsurf/desktop/options.h" +#include "desktop/options.h" extern bool option_render_cairo; extern bool option_render_resample; |