diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-10-29 00:17:11 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-29 00:18:12 +0000 |
| commit | 7ace528729c37d665e269c8a76991739c9437088 (patch) | |
| tree | c6e6d60655da38fecd8f9bd74980b01f402715e8 /gtk | |
| parent | 4b941297aaa8de2b092b6b799fcfc91d6e0e4782 (diff) | |
| download | netsurf-7ace528729c37d665e269c8a76991739c9437088.tar.gz netsurf-7ace528729c37d665e269c8a76991739c9437088.tar.bz2 | |
Update url setting API to return nserror code instead of calling warn_user
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/scaffolding.c | 14 | ||||
| -rw-r--r-- | gtk/scaffolding.h | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 0fa247030..571ba93e9 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -2309,12 +2309,16 @@ void gui_window_set_title(struct gui_window *gw, const char *title) } -void gui_window_set_url(struct gui_window *_g, const char *url) +nserror gui_window_set_url(struct gui_window *gw, const char *url) { - struct nsgtk_scaffolding *g = nsgtk_get_scaffold(_g); - if (g->top_level != _g) return; - gtk_entry_set_text(GTK_ENTRY(g->url_bar), url); - gtk_editable_set_position(GTK_EDITABLE(g->url_bar), -1); + struct nsgtk_scaffolding *g; + + g = nsgtk_get_scaffold(gw); + if (g->top_level == gw) { + gtk_entry_set_text(GTK_ENTRY(g->url_bar), url); + gtk_editable_set_position(GTK_EDITABLE(g->url_bar), -1); + } + return NSERROR_OK; } void gui_window_start_throbber(struct gui_window* _g) diff --git a/gtk/scaffolding.h b/gtk/scaffolding.h index e7d945ebc..07433bffa 100644 --- a/gtk/scaffolding.h +++ b/gtk/scaffolding.h @@ -235,7 +235,7 @@ nserror nsgtk_scaffolding_new_tab(struct gui_window *gw); /* core acessors */ void gui_window_set_title(struct gui_window *g, const char *title); -void gui_window_set_url(struct gui_window *g, const char *url); +nserror gui_window_set_url(struct gui_window *g, const char *url); void gui_window_start_throbber(struct gui_window *g); void gui_window_stop_throbber(struct gui_window *g); |