diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-04 14:55:23 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-04 14:55:23 +0000 |
| commit | f2993e6ed037023e28837c7c666627380235bd14 (patch) | |
| tree | 8d3d27a37e14a49a33a327074d08fb7177b3834c /gtk | |
| parent | 890bb679939c9ecde30af7ed752e292bfe6feb28 (diff) | |
| download | netsurf-f2993e6ed037023e28837c7c666627380235bd14.tar.gz netsurf-f2993e6ed037023e28837c7c666627380235bd14.tar.bz2 | |
content_get_url -> hlcache_handle_get_url, content__get_url -> content_get_url
svn path=/trunk/netsurf/; revision=13236
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/dialogs/options.c | 2 | ||||
| -rw-r--r-- | gtk/dialogs/source.c | 2 | ||||
| -rw-r--r-- | gtk/scaffolding.c | 14 | ||||
| -rw-r--r-- | gtk/toolbar.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/gtk/dialogs/options.c b/gtk/dialogs/options.c index 01e1a1b8c..32eb62567 100644 --- a/gtk/dialogs/options.c +++ b/gtk/dialogs/options.c @@ -579,7 +579,7 @@ ENTRY_CHANGED(entryHomePageURL, option_homepage_url) END_HANDLER BUTTON_CLICKED(setCurrentPage) - const gchar *url = nsurl_access(content_get_url( + const gchar *url = nsurl_access(hlcache_handle_get_url( current_browser->current_content)); gtk_entry_set_text(GTK_ENTRY(entryHomePageURL), url); option_homepage_url = diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index 85a04949b..d4bf429c1 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -166,7 +166,7 @@ void nsgtk_source_dialog_init(GtkWindow *parent, struct browser_window *bw) return; } - thiswindow->url = strdup(nsurl_access(content_get_url( + thiswindow->url = strdup(nsurl_access(hlcache_handle_get_url( bw->current_content))); if (thiswindow->url == NULL) { free(thiswindow); diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index a07c57129..26df12ed1 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -337,9 +337,9 @@ static void nsgtk_window_update_back_forward(struct gtk_scaffolding *g) /* update the url bar, particularly necessary when tabbing */ if (bw->current_content != NULL && - content_get_url(bw->current_content) != NULL) + hlcache_handle_get_url(bw->current_content) != NULL) browser_window_refresh_url_bar(bw, - content_get_url(bw->current_content), + hlcache_handle_get_url(bw->current_content), bw->frag_id); /* update the local history window, as well as queuing a redraw @@ -621,7 +621,7 @@ MULTIHANDLER(savepage) gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fc), filter); gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(fc), filter); - res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window( + res = url_nice(nsurl_access(hlcache_handle_get_url(nsgtk_get_browser_window( g->top_level)->current_content)), &path, false); if (res != URL_FUNC_OK) { path = strdup(messages_get("SaveText")); @@ -682,7 +682,7 @@ MULTIHANDLER(pdf) LOG(("Print preview (generating PDF) started.")); - res = url_nice(nsurl_access(content_get_url(bw->current_content)), + res = url_nice(nsurl_access(hlcache_handle_get_url(bw->current_content)), &url_name, true); if (res != URL_FUNC_OK) { warn_user(messages_get(res == URL_FUNC_NOMEM ? "NoMemory" @@ -757,7 +757,7 @@ MULTIHANDLER(plaintext) char *filename; url_func_result res; - res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window( + res = url_nice(nsurl_access(hlcache_handle_get_url(nsgtk_get_browser_window( g->top_level)->current_content)), &filename, false); if (res != URL_FUNC_OK) { filename = strdup(messages_get("SaveText")); @@ -1408,9 +1408,9 @@ MULTIHANDLER(addbookmarks) struct browser_window *bw = nsgtk_get_browser_window(g->top_level); if (bw == NULL || bw->current_content == NULL || - content_get_url(bw->current_content) == NULL) + hlcache_handle_get_url(bw->current_content) == NULL) return TRUE; - hotlist_add_page(nsurl_access(content_get_url(bw->current_content))); + hotlist_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content))); return TRUE; } diff --git a/gtk/toolbar.c b/gtk/toolbar.c index a6b6b283e..9866becb1 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -412,13 +412,13 @@ void nsgtk_toolbar_close(nsgtk_scaffolding *g) NSGTK_WINDOW_SIGNAL_REDRAW)); if ((nsgtk_get_browser_window(nsgtk_scaffolding_top_level( list))->current_content != NULL) && - (content_get_url(nsgtk_get_browser_window( + (hlcache_handle_get_url(nsgtk_get_browser_window( nsgtk_scaffolding_top_level(list))-> current_content) != NULL)) browser_window_refresh_url_bar( nsgtk_get_browser_window( nsgtk_scaffolding_top_level(list)), - content_get_url( + hlcache_handle_get_url( nsgtk_get_browser_window( nsgtk_scaffolding_top_level(list))-> current_content), |