diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-01-19 15:10:29 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-01-19 15:10:29 +0000 |
commit | 65bdef55ab12bf07aa52fb9c184c073cbf562e3b (patch) | |
tree | e5459965d206721d5e29f156f812951074b4edb2 | |
parent | 0a5f63abf145c05ed9994566289316516310a603 (diff) | |
download | netsurf-65bdef55ab12bf07aa52fb9c184c073cbf562e3b.tar.gz netsurf-65bdef55ab12bf07aa52fb9c184c073cbf562e3b.tar.bz2 |
move the container code to gtk directory as its only ever used there.
-rw-r--r-- | gtk/Makefile.target | 5 | ||||
-rw-r--r-- | gtk/scaffolding.c | 2 | ||||
-rw-r--r-- | gtk/theme.c | 2 | ||||
-rw-r--r-- | gtk/theme.h | 3 | ||||
-rw-r--r-- | gtk/theme_container.c (renamed from utils/container.c) | 4 | ||||
-rw-r--r-- | gtk/theme_container.h (renamed from utils/container.h) | 0 |
6 files changed, 7 insertions, 9 deletions
diff --git a/gtk/Makefile.target b/gtk/Makefile.target index 5efe65fd8..50d2a77fd 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -179,12 +179,11 @@ endif S_GTK := font_pango.c bitmap.c gui.c schedule.c plotters.c \ treeview.c scaffolding.c gdk.c completion.c login.c throbber.c \ selection.c history.c window.c fetch.c download.c menu.c \ - print.c search.c tabs.c theme.c toolbar.c gettext.c \ + print.c search.c tabs.c theme.c theme_container.c toolbar.c gettext.c \ compat.c cookies.c hotlist.c viewdata.c viewsource.c \ preferences.c about.c ssl_cert.c resources.c -S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c) -# code in utils/container.ch is non-universal it seems +S_GTK := $(addprefix gtk/,$(S_GTK)) # This is the final source build list # Note this is deliberately *not* expanded here as common and image diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 19d5b2e15..a9a3d0589 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -62,12 +62,12 @@ #include "gtk/plotters.h" #include "gtk/print.h" #include "gtk/search.h" -#include "gtk/theme.h" #include "gtk/throbber.h" #include "gtk/toolbar.h" #include "gtk/window.h" #include "gtk/gdk.h" #include "gtk/scaffolding.h" +#include "gtk/theme.h" #include "gtk/tabs.h" #include "gtk/schedule.h" #include "gtk/viewdata.h" diff --git a/gtk/theme.c b/gtk/theme.c index eb43fc588..9baab13ed 100644 --- a/gtk/theme.c +++ b/gtk/theme.c @@ -24,7 +24,6 @@ #include "utils/config.h" #include "utils/nsoption.h" -#include "utils/container.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" @@ -39,6 +38,7 @@ #include "gtk/scaffolding.h" #include "gtk/menu.h" #include "gtk/theme.h" +#include "gtk/theme_container.h" #include "gtk/window.h" #include "gtk/preferences.h" diff --git a/gtk/theme.h b/gtk/theme.h index b3059ee93..32a7ffcdb 100644 --- a/gtk/theme.h +++ b/gtk/theme.h @@ -19,9 +19,6 @@ #ifndef _NETSURF_GTK_THEME_H_ #define _NETSURF_GTK_THEME_H_ -#include <gtk/gtk.h> -#include "gtk/scaffolding.h" - typedef enum search_buttons { SEARCH_BACK_BUTTON = 0, SEARCH_FORWARD_BUTTON, diff --git a/utils/container.c b/gtk/theme_container.c index 68ea32211..3a86ea9d4 100644 --- a/utils/container.c +++ b/gtk/theme_container.c @@ -38,12 +38,14 @@ #include <stdbool.h> #include <sys/stat.h> #include <arpa/inet.h> + #include "utils/config.h" -#include "utils/container.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" +#include "gtk/theme_container.h" + #ifdef WITH_MMAP #include <sys/mman.h> #endif diff --git a/utils/container.h b/gtk/theme_container.h index de880ecd5..de880ecd5 100644 --- a/utils/container.h +++ b/gtk/theme_container.h |