diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2006-04-09 23:21:13 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2006-04-09 23:21:13 +0000 |
| commit | c09eb457df1962f5b014214874b2beffd69141a4 (patch) | |
| tree | a7c30e8b57b1d8bdeb87127c8f1ba16e91bf3971 /gtk/gtk_gui.c | |
| parent | e5e1b982d55636b409b194cf0488ebafe9c6d519 (diff) | |
| download | netsurf-c09eb457df1962f5b014214874b2beffd69141a4.tar.gz netsurf-c09eb457df1962f5b014214874b2beffd69141a4.tar.bz2 | |
Unify information databases
svn path=/trunk/netsurf/; revision=2519
Diffstat (limited to 'gtk/gtk_gui.c')
| -rw-r--r-- | gtk/gtk_gui.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index b97733d46..7c7a0e420 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -18,7 +18,7 @@ #include <gtk/gtk.h> #include "netsurf/content/content.h" #include "netsurf/content/fetch.h" -#include "netsurf/content/url_store.h" +#include "netsurf/content/urldb.h" #include "netsurf/desktop/401login.h" #include "netsurf/desktop/browser.h" #include "netsurf/desktop/gui.h" @@ -128,23 +128,23 @@ void gui_init(int argc, char** argv) find_resource(buf, "Default.css", "Default.css"); default_stylesheet_url = path_to_url(buf); LOG(("Using '%s' as Default CSS URL", default_stylesheet_url)); - + find_resource(buf, "AdBlock.css", "AdBlock.css"); adblock_stylesheet_url = path_to_url(buf); LOG(("Using '%s' as AdBlock CSS URL", adblock_stylesheet_url)); - + } void gui_init2(int argc, char** argv) { const char *addr = "http://netsurf.sourceforge.net/"; - + if (option_homepage_url != NULL) addr = option_homepage_url; if (argc > 1) addr = argv[1]; - browser_window_create(addr, 0, 0); + browser_window_create(addr, 0, 0); } @@ -283,7 +283,7 @@ void gui_401login_open(struct browser_window *bw, struct content *c, void gui_cert_verify(struct browser_window *bw, struct content *c, const struct ssl_cert_info *certs, unsigned long num) {} -void global_history_add(struct url_content *data) {} +void global_history_add(const char *url) {} utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, char **result) |