diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtk_gui.c | 12 | ||||
-rw-r--r-- | gtk/gtk_thumbnail.c | 6 | ||||
-rw-r--r-- | gtk/gtk_treeview.c | 3 |
3 files changed, 11 insertions, 10 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) diff --git a/gtk/gtk_thumbnail.c b/gtk/gtk_thumbnail.c index 178014d5c..4d4fea11c 100644 --- a/gtk/gtk_thumbnail.c +++ b/gtk/gtk_thumbnail.c @@ -16,7 +16,7 @@ #include <assert.h> #include <gtk/gtk.h> #include "netsurf/content/content.h" -#include "netsurf/content/url_store.h" +#include "netsurf/content/urldb.h" #include "netsurf/desktop/plotters.h" #include "netsurf/desktop/browser.h" #include "netsurf/image/bitmap.h" @@ -69,7 +69,7 @@ bool thumbnail_create(struct content *content, struct bitmap *bitmap, content->width, content->width); gdk_pixbuf_scale(big, pixbuf, 0, 0, width, height, 0, 0, - (double)width / (double)content->width, + (double)width / (double)content->width, (double)height / (double)content->width, GDK_INTERP_TILES); @@ -79,7 +79,7 @@ bool thumbnail_create(struct content *content, struct bitmap *bitmap, /* register the thumbnail with the URL */ if (url) - url_store_add_thumbnail(url, bitmap); + urldb_set_thumbnail(url, bitmap); bitmap_modified(bitmap); diff --git a/gtk/gtk_treeview.c b/gtk/gtk_treeview.c index 6b9280c5d..ba4214ff9 100644 --- a/gtk/gtk_treeview.c +++ b/gtk/gtk_treeview.c @@ -82,7 +82,8 @@ void tree_recalculate_node_element(struct node_element *element) { * * \param node the node to update */ -void tree_update_URL_node(struct node *node, struct url_content *data) { +void tree_update_URL_node(struct node *node, const char *url, + const struct url_data *data) { } |