Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/f7c2971be3a4e9b4b9eab... ...commit http://git.netsurf-browser.org/netsurf.git/commit/f7c2971be3a4e9b4b9eabae... ...tree http://git.netsurf-browser.org/netsurf.git/tree/f7c2971be3a4e9b4b9eabae63... The branch, master has been updated via f7c2971be3a4e9b4b9eabae6386de07a5172be13 (commit) via 70dd445d5b5ec0ac8f5f708b4938f8d2c1b5ce07 (commit) via ca6ac7c37e2ffeadbabbc03daa7eb80187c7f028 (commit) via 305f1acc79c0d04172a872e60797baa6397d2a79 (commit) via 37db0f6f8520aeb9d5bfafa6b94e8c976ff85111 (commit) from 1200fedb1c42839da1791c5c46d881a02a47b9c0 (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=f7c2971be3a4e9b4b9e... commit f7c2971be3a4e9b4b9eabae6386de07a5172be13 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Replace some over-zealous deletion diff --git a/amiga/gui.c b/amiga/gui.c index 837e018..fddf4ab 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3134,6 +3134,8 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char if(item > AMI_GUI_TOOLBAR_MAX) return false; if(is_folder == true) return false; + tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title); + speed_button_node = AllocSpeedButtonNode(item, SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item], SBNA_UserData, (void *)url, commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=70dd445d5b5ec0ac8f5... commit 70dd445d5b5ec0ac8f5f708b4938f8d2c1b5ce07 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Remove dead code diff --git a/amiga/font_scan.c b/amiga/font_scan.c index fa2799a..95eacaa 100644 --- a/amiga/font_scan.c +++ b/amiga/font_scan.c @@ -513,24 +513,4 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save, LOG(("Initialised with %ld glyphs", found)); } -#if 0 -#warning FIXME: font_scan.c needs fixing for OS3 -void ami_font_scan_init(const char *filename, bool force_scan, bool save, - lwc_string **glypharray) -{ -} - -void ami_font_scan_fini(lwc_string **glypharray) -{ -} - -void ami_font_scan_save(const char *filename, lwc_string **glypharray) -{ -} - -const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray) -{ -} -#endif - commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ca6ac7c37e2ffeadbab... commit ca6ac7c37e2ffeadbabbc03daa7eb80187c7f028 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix creation of SpeedBar objects diff --git a/amiga/libs.h b/amiga/libs.h index e539876..57a430f 100644 --- a/amiga/libs.h +++ b/amiga/libs.h @@ -63,7 +63,7 @@ extern Class *WindowClass; #define RadioButtonObj NewObject(RadioButtonClass, NULL #define ScrollerObj NewObject(ScrollerClass, NULL #define SpaceObj NewObject(SpaceClass, NULL -#define SpeedBarObj NewObject(ScrollerClass, NULL +#define SpeedBarObj NewObject(SpeedBarClass, NULL #define StringObj NewObject(StringClass, NULL #define WindowObj NewObject(WindowClass, NULL commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=305f1acc79c0d04172a... commit 305f1acc79c0d04172a872e60797baa6397d2a79 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Remove unneeded #ifdefs diff --git a/amiga/gui.c b/amiga/gui.c index efa9fdd..837e018 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3158,7 +3158,6 @@ static int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_lis static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) { -#ifdef __amigaos4__ struct TagItem attrs[2]; attrs[0].ti_Tag = CHILD_MinWidth; @@ -3203,9 +3202,6 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) ami_schedule_redraw(gwin, true); } -#else -#warning FIXME for OS3 -#endif } static void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List *speed_button_list) commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=37db0f6f8520aeb9d5b... commit 37db0f6f8520aeb9d5bfafa6b94e8c976ff85111 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Open the interface for speedbar.gadget diff --git a/amiga/gui.c b/amiga/gui.c index e6487ea..efa9fdd 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3134,12 +3134,6 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char if(item > AMI_GUI_TOOLBAR_MAX) return false; if(is_folder == true) return false; - if(title) { - tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title); - } else { - tb_userdata->gw->hotlist_toolbar_lab[item] = strdup("(untitled)"); - } - speed_button_node = AllocSpeedButtonNode(item, SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item], SBNA_UserData, (void *)url, diff --git a/amiga/libs.c b/amiga/libs.c index c37774a..903c0f7 100644 --- a/amiga/libs.c +++ b/amiga/libs.c @@ -254,7 +254,7 @@ bool ami_libs_open(void) AMINS_CLASS_OPEN("gadgets/radiobutton.gadget", 44, RadioButton, RADIOBUTTON, false) AMINS_CLASS_OPEN("gadgets/scroller.gadget", 44, Scroller, SCROLLER, false) AMINS_CLASS_OPEN("gadgets/space.gadget", 44, Space, SPACE, false) - AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, false) + AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, true) AMINS_CLASS_OPEN("gadgets/string.gadget", 44, String, STRING, false) AMINS_CLASS_OPEN("window.class", 44, Window, WINDOW, false) ----------------------------------------------------------------------- Summary of changes: amiga/font_scan.c | 20 -------------------- amiga/gui.c | 10 +--------- amiga/libs.c | 2 +- amiga/libs.h | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/amiga/font_scan.c b/amiga/font_scan.c index fa2799a..95eacaa 100644 --- a/amiga/font_scan.c +++ b/amiga/font_scan.c @@ -513,24 +513,4 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save, LOG(("Initialised with %ld glyphs", found)); } -#if 0 -#warning FIXME: font_scan.c needs fixing for OS3 -void ami_font_scan_init(const char *filename, bool force_scan, bool save, - lwc_string **glypharray) -{ -} - -void ami_font_scan_fini(lwc_string **glypharray) -{ -} - -void ami_font_scan_save(const char *filename, lwc_string **glypharray) -{ -} - -const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray) -{ -} -#endif - diff --git a/amiga/gui.c b/amiga/gui.c index e6487ea..fddf4ab 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3134,11 +3134,7 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char if(item > AMI_GUI_TOOLBAR_MAX) return false; if(is_folder == true) return false; - if(title) { - tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title); - } else { - tb_userdata->gw->hotlist_toolbar_lab[item] = strdup("(untitled)"); - } + tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title); speed_button_node = AllocSpeedButtonNode(item, SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item], @@ -3164,7 +3160,6 @@ static int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_lis static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) { -#ifdef __amigaos4__ struct TagItem attrs[2]; attrs[0].ti_Tag = CHILD_MinWidth; @@ -3209,9 +3204,6 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) ami_schedule_redraw(gwin, true); } -#else -#warning FIXME for OS3 -#endif } static void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List *speed_button_list) diff --git a/amiga/libs.c b/amiga/libs.c index c37774a..903c0f7 100644 --- a/amiga/libs.c +++ b/amiga/libs.c @@ -254,7 +254,7 @@ bool ami_libs_open(void) AMINS_CLASS_OPEN("gadgets/radiobutton.gadget", 44, RadioButton, RADIOBUTTON, false) AMINS_CLASS_OPEN("gadgets/scroller.gadget", 44, Scroller, SCROLLER, false) AMINS_CLASS_OPEN("gadgets/space.gadget", 44, Space, SPACE, false) - AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, false) + AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, true) AMINS_CLASS_OPEN("gadgets/string.gadget", 44, String, STRING, false) AMINS_CLASS_OPEN("window.class", 44, Window, WINDOW, false) diff --git a/amiga/libs.h b/amiga/libs.h index e539876..57a430f 100644 --- a/amiga/libs.h +++ b/amiga/libs.h @@ -63,7 +63,7 @@ extern Class *WindowClass; #define RadioButtonObj NewObject(RadioButtonClass, NULL #define ScrollerObj NewObject(ScrollerClass, NULL #define SpaceObj NewObject(SpaceClass, NULL -#define SpeedBarObj NewObject(ScrollerClass, NULL +#define SpeedBarObj NewObject(SpeedBarClass, NULL #define StringObj NewObject(StringClass, NULL #define WindowObj NewObject(WindowClass, NULL -- NetSurf Browser