netsurf: branch master updated. release/3.9-530-g82805f7

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/82805f72e69af367317f8... ...commit http://git.netsurf-browser.org/netsurf.git/commit/82805f72e69af367317f83a... ...tree http://git.netsurf-browser.org/netsurf.git/tree/82805f72e69af367317f83a56... The branch, master has been updated via 82805f72e69af367317f83a5674590fd92b4572f (commit) via c8efbbc206331319587856c8fdd48a966ed48497 (commit) from 1a25234f20b6c634024196143677c14e8142576c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=82805f72e69af367317... commit 82805f72e69af367317f83a5674590fd92b4572f Author: Michael Drake <michael.drake(a)codethink.co.uk&gt; Commit: Michael Drake <michael.drake(a)codethink.co.uk&gt; Browser window: Rework constification of bw for show_certificates. diff --git a/desktop/browser_private.h b/desktop/browser_private.h index 41b8fef..c9f9bbc 100644 --- a/desktop/browser_private.h +++ b/desktop/browser_private.h @@ -283,7 +283,8 @@ struct browser_window { * \param existing The existing window if cloning, else NULL */ nserror browser_window_initialise_common(enum browser_window_create_flags flags, - struct browser_window *bw, struct browser_window *existing); + struct browser_window *bw, + const struct browser_window *existing); /** @@ -331,7 +332,8 @@ void browser_window_set_status(struct browser_window *bw, const char *text); * \param bw browser window to set the type of the current drag for * \return root browser window */ -struct browser_window * browser_window_get_root(struct browser_window *bw); +struct browser_window * browser_window_get_root( + struct browser_window *bw); /** diff --git a/desktop/browser_window.c b/desktop/browser_window.c index f705ce9..602c8e1 100644 --- a/desktop/browser_window.c +++ b/desktop/browser_window.c @@ -3090,7 +3090,7 @@ browser_window_create(enum browser_window_create_flags flags, nserror browser_window_initialise_common(enum browser_window_create_flags flags, struct browser_window *bw, - struct browser_window *existing) + const struct browser_window *existing) { nserror err; assert(bw); @@ -4765,7 +4765,7 @@ nserror browser_window_show_cookies( } /* Exported interface, documented in browser_window.h */ -nserror browser_window_show_certificates(const struct browser_window *bw) +nserror browser_window_show_certificates(struct browser_window *bw) { nserror res; nsurl *url; diff --git a/include/netsurf/browser_window.h b/include/netsurf/browser_window.h index e463dfa..73ca8e8 100644 --- a/include/netsurf/browser_window.h +++ b/include/netsurf/browser_window.h @@ -817,6 +817,6 @@ nserror browser_window_show_cookies( * \return NSERROR_OK, or appropriate error otherwise. */ nserror browser_window_show_certificates( - const struct browser_window *bw); + struct browser_window *bw); #endif commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c8efbbc206331319587... commit c8efbbc206331319587856c8fdd48a966ed48497 Author: Michael Drake <michael.drake(a)codethink.co.uk&gt; Commit: Michael Drake <michael.drake(a)codethink.co.uk&gt; Page info: We need a non-const browser window. Due to where we pass it back out to browser window. diff --git a/desktop/page-info.c b/desktop/page-info.c index 89c63b7..416c8e5 100644 --- a/desktop/page-info.c +++ b/desktop/page-info.c @@ -238,7 +238,7 @@ struct page_info { const struct core_window_callback_table *cw_t; struct core_window *cw_h; - const struct browser_window *bw; + struct browser_window *bw; lwc_string *domain; browser_window_page_info_state state; @@ -464,7 +464,7 @@ static nserror page_info__set_text( */ static nserror page_info__create_from_bw( struct page_info *pi, - const struct browser_window *bw) + struct browser_window *bw) { nsurl *url = browser_window_access_url(bw); @@ -527,7 +527,7 @@ static nserror page_info__layout( nserror page_info_create( const struct core_window_callback_table *cw_t, struct core_window *cw_h, - const struct browser_window *bw, + struct browser_window *bw, struct page_info **pi_out) { struct page_info *pi; diff --git a/desktop/page-info.h b/desktop/page-info.h index 89b82e0..d4437fd 100644 --- a/desktop/page-info.h +++ b/desktop/page-info.h @@ -68,7 +68,7 @@ nserror page_info_fini(void); nserror page_info_create( const struct core_window_callback_table *cw_t, struct core_window *cw_h, - const struct browser_window *bw, + struct browser_window *bw, struct page_info **pi_out); /** ----------------------------------------------------------------------- Summary of changes: desktop/browser_private.h | 6 ++++-- desktop/browser_window.c | 4 ++-- desktop/page-info.c | 6 +++--- desktop/page-info.h | 2 +- include/netsurf/browser_window.h | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/desktop/browser_private.h b/desktop/browser_private.h index 41b8fef..c9f9bbc 100644 --- a/desktop/browser_private.h +++ b/desktop/browser_private.h @@ -283,7 +283,8 @@ struct browser_window { * \param existing The existing window if cloning, else NULL */ nserror browser_window_initialise_common(enum browser_window_create_flags flags, - struct browser_window *bw, struct browser_window *existing); + struct browser_window *bw, + const struct browser_window *existing); /** @@ -331,7 +332,8 @@ void browser_window_set_status(struct browser_window *bw, const char *text); * \param bw browser window to set the type of the current drag for * \return root browser window */ -struct browser_window * browser_window_get_root(struct browser_window *bw); +struct browser_window * browser_window_get_root( + struct browser_window *bw); /** diff --git a/desktop/browser_window.c b/desktop/browser_window.c index f705ce9..602c8e1 100644 --- a/desktop/browser_window.c +++ b/desktop/browser_window.c @@ -3090,7 +3090,7 @@ browser_window_create(enum browser_window_create_flags flags, nserror browser_window_initialise_common(enum browser_window_create_flags flags, struct browser_window *bw, - struct browser_window *existing) + const struct browser_window *existing) { nserror err; assert(bw); @@ -4765,7 +4765,7 @@ nserror browser_window_show_cookies( } /* Exported interface, documented in browser_window.h */ -nserror browser_window_show_certificates(const struct browser_window *bw) +nserror browser_window_show_certificates(struct browser_window *bw) { nserror res; nsurl *url; diff --git a/desktop/page-info.c b/desktop/page-info.c index 89c63b7..416c8e5 100644 --- a/desktop/page-info.c +++ b/desktop/page-info.c @@ -238,7 +238,7 @@ struct page_info { const struct core_window_callback_table *cw_t; struct core_window *cw_h; - const struct browser_window *bw; + struct browser_window *bw; lwc_string *domain; browser_window_page_info_state state; @@ -464,7 +464,7 @@ static nserror page_info__set_text( */ static nserror page_info__create_from_bw( struct page_info *pi, - const struct browser_window *bw) + struct browser_window *bw) { nsurl *url = browser_window_access_url(bw); @@ -527,7 +527,7 @@ static nserror page_info__layout( nserror page_info_create( const struct core_window_callback_table *cw_t, struct core_window *cw_h, - const struct browser_window *bw, + struct browser_window *bw, struct page_info **pi_out) { struct page_info *pi; diff --git a/desktop/page-info.h b/desktop/page-info.h index 89b82e0..d4437fd 100644 --- a/desktop/page-info.h +++ b/desktop/page-info.h @@ -68,7 +68,7 @@ nserror page_info_fini(void); nserror page_info_create( const struct core_window_callback_table *cw_t, struct core_window *cw_h, - const struct browser_window *bw, + struct browser_window *bw, struct page_info **pi_out); /** diff --git a/include/netsurf/browser_window.h b/include/netsurf/browser_window.h index e463dfa..73ca8e8 100644 --- a/include/netsurf/browser_window.h +++ b/include/netsurf/browser_window.h @@ -817,6 +817,6 @@ nserror browser_window_show_cookies( * \return NSERROR_OK, or appropriate error otherwise. */ nserror browser_window_show_certificates( - const struct browser_window *bw); + struct browser_window *bw); #endif -- NetSurf Browser