diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-11-02 22:44:20 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-11-02 22:44:20 +0000 |
| commit | a32563488228ac82ae155493e6cab0e93bd6506c (patch) | |
| tree | 92765947c60ed4c2219444a72636ad88c8154def | |
| parent | c14ddad660d3c07f8dbdc8f8db902e5767821d9c (diff) | |
| download | netsurf-a32563488228ac82ae155493e6cab0e93bd6506c.tar.gz netsurf-a32563488228ac82ae155493e6cab0e93bd6506c.tar.bz2 | |
fix errors in change url setting api to take an nsurl instead of a text string
| -rw-r--r-- | atari/gui.c | 1 | ||||
| -rw-r--r-- | beos/scaffolding.cpp | 4 | ||||
| -rw-r--r-- | beos/scaffolding.h | 2 | ||||
| -rw-r--r-- | desktop/gui_window.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/atari/gui.c b/atari/gui.c index c077df895..759bffb50 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -36,6 +36,7 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/nsoption.h" +#include "utils/corestrings.h" #include "content/urldb.h" #include "content/fetch.h" #include "content/fetchers/resource.h" diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp index cdd809f0e..d1a9930c5 100644 --- a/beos/scaffolding.cpp +++ b/beos/scaffolding.cpp @@ -2166,7 +2166,7 @@ void gui_window_set_status(struct gui_window *_g, const char *text) g->top_view->UnlockLooper(); } -nserror gui_window_set_url(struct gui_window *gw, const char *url) +nserror gui_window_set_url(struct gui_window *gw, nsurl *url) { struct beos_scaffolding *g; @@ -2177,7 +2177,7 @@ nserror gui_window_set_url(struct gui_window *gw, const char *url) assert(g->status_bar); if (g->top_view->LockLooper()) { - g->url_bar->SetText(url); + g->url_bar->SetText(nsurl_access(url)); g->top_view->UnlockLooper(); } diff --git a/beos/scaffolding.h b/beos/scaffolding.h index 0be619d74..cdb481e13 100644 --- a/beos/scaffolding.h +++ b/beos/scaffolding.h @@ -203,7 +203,7 @@ void nsbeos_scaffolding_destroy(nsbeos_scaffolding *scaffold); void nsbeos_scaffolding_popup_menu(nsbeos_scaffolding *g, BPoint where); void gui_window_set_title(struct gui_window *_g, const char *title); -nserror gui_window_set_url(struct gui_window *_g, const char *url); +nserror gui_window_set_url(struct gui_window *_g, struct nsurl *url); void gui_window_set_icon(struct gui_window *_g, struct hlcache_handle *icon); void gui_window_set_status(struct gui_window *_g, const char *text); void gui_window_start_throbber(struct gui_window* _g); diff --git a/desktop/gui_window.h b/desktop/gui_window.h index a8071a4e9..63a62907f 100644 --- a/desktop/gui_window.h +++ b/desktop/gui_window.h @@ -60,6 +60,8 @@ struct browser_window; struct form_control; struct rect; struct hlcache_handle; +struct nsurl; + enum gui_pointer_shape; /** |