remove unecessary utils/url.h includes

amiga/file.c

@@ -36,7 +36,6 @@
 #include "desktop/save_text.h"
 
 #include "utils/messages.h"
-#include "utils/url.h"
 
 #include <proto/asl.h>
 #include <proto/dos.h>

amiga/gui.c

@@ -35,7 +35,6 @@
 #include "utils/messages.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 #include "utils/file.h"
 #include "content/fetchers/resource.h"
 

amiga/history_local.c

@@ -32,7 +32,6 @@
 #include "amiga/object.h"
 #include "amiga/gui.h"
 #include "utils/log.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include <proto/intuition.h>
 #include "amiga/history_local.h"

amiga/login.c

@@ -23,7 +23,6 @@
 #include <proto/exec.h>
 #include <proto/intuition.h>
 #include <proto/utility.h>
-#include "utils/url.h"
 #include "content/urldb.h"
 #include "utils/messages.h"
 #include "utils/errors.h"

atari/cookies.c

@@ -35,7 +35,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 #include "atari/gui.h"
 #include "atari/misc.h"
 #include "atari/treeview.h"

atari/deskmenu.c

@@ -1,9 +1,26 @@
+/*
+ * Copyright 2010 Ole Loots <ole@monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <stdlib.h>
 #include <cflib.h>
 
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "desktop/browser.h"
 #include "desktop/browser_private.h"
 #include "utils/nsoption.h"

atari/filetype.c

@@ -23,7 +23,6 @@
 
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 #include "utils/log.h"
 #include "content/fetch.h"
 

atari/findfile.c

@@ -26,7 +26,6 @@
 #include <curl/curl.h>
 
 #include "utils/log.h"
-#include "utils/url.h"
 #include "atari/gemtk/gemtk.h"
 #include "atari/findfile.h"
 #include "atari/gui.h"

atari/gui.c

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
-	This File provides all the mandatory functions prefixed with gui_
-*/
+/**
+ * \file Provides all the mandatory functions prefixed with gui_ for atari
+ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -30,7 +30,6 @@
 #include <stdbool.h>
 #include <hubbub/hubbub.h>
 
-#include "utils/url.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"

atari/history.c

@@ -37,7 +37,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 #include "atari/gui.h"
 #include "atari/misc.h"
 #include "atari/treeview.h"

atari/hotlist.c

@@ -36,7 +36,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 #include "atari/gui.h"
 #include "atari/misc.h"
 #include "atari/treeview.h"

atari/login.c

@@ -32,7 +32,6 @@
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/log.h"
-#include "utils/url.h"
 #include "content/urldb.h"
 #include "content/fetch.h"
 #include "atari/misc.h"

atari/misc.c

@@ -33,7 +33,6 @@
 #include "utils/nsoption.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 #include "utils/log.h"
 #include "content/fetch.h"
 

beos/fetch_rsrc.cpp

@@ -38,7 +38,6 @@ extern "C" {
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
 #include "utils/base64.h"

cocoa/NetsurfApp.m

@@ -37,7 +37,6 @@
 #import "desktop/textinput.h"
 #import "desktop/tree.h"
 #import "render/html.h"
-#import "utils/url.h"
 #import "utils/filename.h"
 #import "utils/log.h"
 #import "utils/messages.h"

content/fetchers/about.c

@@ -53,7 +53,6 @@
 #include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
 #include "image/image_cache.h"

content/fetchers/data.c

@@ -38,7 +38,6 @@
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
 #include "utils/base64.h"

content/fetchers/file.c

@@ -49,7 +49,6 @@
 #include "utils/errors.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
 #include "utils/file.h"

content/fetchers/resource.c

@@ -46,7 +46,6 @@
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
 

content/hlcache.c

@@ -25,16 +25,16 @@
 #include <string.h>
 
 #include "desktop/gui_factory.h"
-#include "content/content.h"
-#include "content/hlcache.h"
-#include "content/mimesniff.h"
 #include "utils/http.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/ring.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
+#include "content/content.h"
+#include "content/mimesniff.h"
+#include "content/hlcache.h"
+
 typedef struct hlcache_entry hlcache_entry;
 typedef struct hlcache_retrieval_ctx hlcache_retrieval_ctx;
 

css/select.c

@@ -23,16 +23,16 @@
 
 #include "content/content_protected.h"
 #include "content/urldb.h"
-#include "css/internal.h"
-#include "css/select.h"
-#include "css/utils.h"
 #include "desktop/system_colour.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
+#include "css/internal.h"
+#include "css/select.h"
+#include "css/utils.h"
+
 #undef PRINT_NODE_BLOOM_DETAILS
 
 static css_error node_name(void *pw, void *node, css_qname *qname);

desktop/browser.c

@@ -63,7 +63,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/nsurl.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/utf8.h"
 

desktop/tree.c

@@ -36,7 +36,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 
 struct tree {
 	unsigned int flags;	/* Tree flags */

framebuffer/Makefile.target

@@ -46,8 +46,7 @@ CFLAGS += -std=c99 -g -Dsmall $(WARNFLAGS) 	\
 	  -D_BSD_SOURCE \
 	  -D_XOPEN_SOURCE=600 \
 	  -D_POSIX_C_SOURCE=200112L \
-	  $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) \
-	  $(shell xml2-config --cflags)
+	  $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
 
 LDFLAGS += -lm -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive 
 

framebuffer/misc.c

@@ -24,7 +24,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 
 void warn_user(const char *warning, const char *detail)
 {

gtk/gui.c

@@ -59,7 +59,6 @@
 #include "utils/filepath.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
 #include "utils/file.h"

gtk/login.c

@@ -30,7 +30,6 @@
 #include "desktop/browser.h"
 #include "desktop/gui.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
 struct session_401 {

monkey/Makefile.target

@@ -44,8 +44,7 @@ MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \
 		$(WARNFLAGS) -g \
 		$(shell $(PKG_CONFIG) --cflags glib-2.0) \
 		$(shell $(PKG_CONFIG) --cflags libdom libcurl) \
-		$(shell $(PKG_CONFIG) --cflags openssl) \
-		$(shell xml2-config --cflags)
+		$(shell $(PKG_CONFIG) --cflags openssl)
 
 MONKEYLDFLAGS := -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0)
 

monkey/main.c

@@ -27,7 +27,6 @@
 #include "desktop/netsurf.h"
 #include "utils/log.h"
 #include "utils/filepath.h"
-#include "utils/url.h"
 
 #include "monkey/poll.h"
 #include "monkey/dispatch.h"

render/box_construct.c

@@ -44,7 +44,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/talloc.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
 #include "render/box.h"

render/html.c

@@ -35,7 +35,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/talloc.h"
-#include "utils/url.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"

render/search.c

@@ -29,7 +29,6 @@
 #include "utils/config.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "content/content.h"
 #include "content/hlcache.h"

riscos/401login.c

@@ -32,7 +32,6 @@
 #include "riscos/wimp_event.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
 #define ICON_401LOGIN_LOGIN 0

riscos/cookies.c

@@ -43,7 +43,6 @@
 #include "riscos/wimp_event.h"
 #include "utils/messages.h"
 #include "utils/log.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
 static void ro_gui_cookies_toolbar_update_buttons(void);

riscos/global_history.c

@@ -44,7 +44,6 @@
 #include "riscos/wimp_event.h"
 #include "utils/messages.h"
 #include "utils/log.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
 static void ro_gui_global_history_toolbar_update_buttons(void);

riscos/history.c

@@ -37,7 +37,6 @@
 #include "riscos/wimp_event.h"
 #include "riscos/wimputils.h"
 #include "utils/log.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
 

riscos/hotlist.c

@@ -39,7 +39,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 #include "utils/nsoption.h"
 
 #include "riscos/gui.h"

riscos/menus.c

@@ -34,7 +34,6 @@
 
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/utf8.h"
 #include "content/content.h"

riscos/theme_install.c

@@ -34,7 +34,6 @@
 #include "riscos/wimp_event.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/utils.h"
 
 

windows/findfile.c

@@ -30,7 +30,6 @@
 
 #include <curl/curl.h>
 
-#include "utils/url.h"
 #include "utils/log.h"
 #include "utils/utils.h"
 #include "utils/filepath.h"

windows/main.c

@@ -29,7 +29,6 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 #include "utils/filepath.h"
 #include "content/fetchers/resource.h"
 

windows/misc.c

@@ -27,7 +27,6 @@
 
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "utils/url.h"
 
 void warn_user(const char *warning, const char *detail)
 {