netsurf: branch master updated. release/3.1-292-g1aed82b

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/1aed82b07428d17b74435... ...commit http://git.netsurf-browser.org/netsurf.git/commit/1aed82b07428d17b74435c2... ...tree http://git.netsurf-browser.org/netsurf.git/tree/1aed82b07428d17b74435c29a... The branch, master has been updated via 1aed82b07428d17b74435c29ac240de8288b85ab (commit) via 846b53485474211a24248c9b0d5cc4205104a772 (commit) via 01271f4061bbc8f8b26492a26e04bdbb8b9746c9 (commit) from 0c5bb37bea878d6b0b622cb7ea6eab649e4c578b (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=1aed82b07428d17b744... commit 1aed82b07428d17b74435c29ac240de8288b85ab Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; fix warnings diff --git a/amiga/launch.c b/amiga/launch.c index 1405d6a..d3c9ff1 100755 --- a/amiga/launch.c +++ b/amiga/launch.c @@ -31,6 +31,7 @@ #include <proto/openurl.h> #include "utils/nsoption.h" +#include "utils/nsurl.h" #include "utils/url.h" struct Library *OpenURLBase = NULL; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=846b53485474211a242... commit 846b53485474211a24248c9b0d5cc4205104a772 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Recreate the entire menu when the hotlist window is closed. This ensures the hotlist entries in the menu are in sync with reality, and mirrors the existing hotlist toolbar update. diff --git a/amiga/gui.c b/amiga/gui.c index 6e84e70..543a774 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3030,7 +3030,10 @@ void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin) } } -void ami_gui_hotlist_toolbar_update_all(void) +/** + * Update hotlist toolbar and recreate the menu for all windows + */ +void ami_gui_hotlist_update_all(void) { struct nsObject *node; struct nsObject *nnode; @@ -3047,6 +3050,7 @@ void ami_gui_hotlist_toolbar_update_all(void) if(node->Type == AMINS_WINDOW) { ami_gui_hotlist_toolbar_update(gwin); + ami_menu_refresh(gwin); } } while(node = nnode); } diff --git a/amiga/gui.h b/amiga/gui.h index 87258a1..c106455 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -162,7 +162,7 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie); bool ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *x, ULONG *y); BOOL ami_gadget_hit(Object *obj, int x, int y); void ami_gui_history(struct gui_window_2 *gwin, bool back); -void ami_gui_hotlist_toolbar_update_all(void); +void ami_gui_hotlist_update_all(void); void ami_gui_tabs_toggle_all(void); bool ami_locate_resource(char *fullpath, const char *file); void ami_gui_update_hotlist_button(struct gui_window_2 *gwin); diff --git a/amiga/menu.c b/amiga/menu.c index c6258be..784fec1 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -485,14 +485,6 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin) if(nsoption_bool(background_images) == true) gwin->menu[M_IMGBACK].nm_Flags |= CHECKED; - /* Set up scheduler to refresh the hotlist menu */ - if(nsoption_int(menu_refresh) > 0) - { - ami_schedule(nsoption_int(menu_refresh) * 10, - (void *)ami_menu_refresh, - gwin); - } - return(gwin->menu); } diff --git a/amiga/options.h b/amiga/options.h index e383dcf..868e28f 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -86,6 +86,4 @@ NSOPTION_INTEGER(redraw_tile_size_y, 0) NSOPTION_INTEGER(monitor_aspect_x, 0) NSOPTION_INTEGER(monitor_aspect_y, 0) NSOPTION_BOOL(accept_lang_locale, true) -NSOPTION_INTEGER(menu_refresh, 0) - diff --git a/amiga/tree.c b/amiga/tree.c index 04c7996..18b071d 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -711,7 +711,7 @@ void ami_tree_close(struct treeview_window *twin) ami_ssl_free(twin); } - ami_gui_hotlist_toolbar_update_all(); + ami_gui_hotlist_update_all(); } void ami_tree_update_quals(struct treeview_window *twin) commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=01271f4061bbc8f8b26... commit 01271f4061bbc8f8b26492a26e04bdbb8b9746c9 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Re-enable favicon render hook. Not sure why or when this was disabled. diff --git a/amiga/gui.c b/amiga/gui.c index 8985d4f..6e84e70 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3542,7 +3542,7 @@ gui_window_create(struct browser_window *bw, SPACE_MinWidth, 16, SPACE_MinHeight, 16, SPACE_Transparent, FALSE, - // SPACE_RenderHook, &g->shared->favicon_hook, + SPACE_RenderHook, &g->shared->favicon_hook, SpaceEnd, CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 8 ++++++-- amiga/gui.h | 2 +- amiga/launch.c | 1 + amiga/menu.c | 8 -------- amiga/options.h | 2 -- amiga/tree.c | 2 +- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index 8985d4f..543a774 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3030,7 +3030,10 @@ void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin) } } -void ami_gui_hotlist_toolbar_update_all(void) +/** + * Update hotlist toolbar and recreate the menu for all windows + */ +void ami_gui_hotlist_update_all(void) { struct nsObject *node; struct nsObject *nnode; @@ -3047,6 +3050,7 @@ void ami_gui_hotlist_toolbar_update_all(void) if(node->Type == AMINS_WINDOW) { ami_gui_hotlist_toolbar_update(gwin); + ami_menu_refresh(gwin); } } while(node = nnode); } @@ -3542,7 +3546,7 @@ gui_window_create(struct browser_window *bw, SPACE_MinWidth, 16, SPACE_MinHeight, 16, SPACE_Transparent, FALSE, - // SPACE_RenderHook, &g->shared->favicon_hook, + SPACE_RenderHook, &g->shared->favicon_hook, SpaceEnd, CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, diff --git a/amiga/gui.h b/amiga/gui.h index 87258a1..c106455 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -162,7 +162,7 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie); bool ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *x, ULONG *y); BOOL ami_gadget_hit(Object *obj, int x, int y); void ami_gui_history(struct gui_window_2 *gwin, bool back); -void ami_gui_hotlist_toolbar_update_all(void); +void ami_gui_hotlist_update_all(void); void ami_gui_tabs_toggle_all(void); bool ami_locate_resource(char *fullpath, const char *file); void ami_gui_update_hotlist_button(struct gui_window_2 *gwin); diff --git a/amiga/launch.c b/amiga/launch.c index 1405d6a..d3c9ff1 100755 --- a/amiga/launch.c +++ b/amiga/launch.c @@ -31,6 +31,7 @@ #include <proto/openurl.h> #include "utils/nsoption.h" +#include "utils/nsurl.h" #include "utils/url.h" struct Library *OpenURLBase = NULL; diff --git a/amiga/menu.c b/amiga/menu.c index c6258be..784fec1 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -485,14 +485,6 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin) if(nsoption_bool(background_images) == true) gwin->menu[M_IMGBACK].nm_Flags |= CHECKED; - /* Set up scheduler to refresh the hotlist menu */ - if(nsoption_int(menu_refresh) > 0) - { - ami_schedule(nsoption_int(menu_refresh) * 10, - (void *)ami_menu_refresh, - gwin); - } - return(gwin->menu); } diff --git a/amiga/options.h b/amiga/options.h index e383dcf..868e28f 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -86,6 +86,4 @@ NSOPTION_INTEGER(redraw_tile_size_y, 0) NSOPTION_INTEGER(monitor_aspect_x, 0) NSOPTION_INTEGER(monitor_aspect_y, 0) NSOPTION_BOOL(accept_lang_locale, true) -NSOPTION_INTEGER(menu_refresh, 0) - diff --git a/amiga/tree.c b/amiga/tree.c index 04c7996..18b071d 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -711,7 +711,7 @@ void ami_tree_close(struct treeview_window *twin) ami_ssl_free(twin); } - ami_gui_hotlist_toolbar_update_all(); + ami_gui_hotlist_update_all(); } void ami_tree_update_quals(struct treeview_window *twin) -- NetSurf Browser