diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-10-12 10:26:28 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-10-12 10:26:28 +0100 |
| commit | af2c37167b1caa30f1771a64302767ec54d00f42 (patch) | |
| tree | ec5294bf72d5924fc73e9705b38aa0dac08af1f3 /amiga | |
| parent | 4cc0d9c233886a419ede7c9791b9ce7252e2dcdb (diff) | |
| download | netsurf-af2c37167b1caa30f1771a64302767ec54d00f42.tar.gz netsurf-af2c37167b1caa30f1771a64302767ec54d00f42.tar.bz2 | |
application.library fix for new SDK. Note that:
* application.library functionality will no longer be available on OS4.0, however that only extends to the Docky icon as notifications weren't supported anyway.
* CI builds may crash until the toolchain is updated.
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/gui.c | 12 | ||||
| -rw-r--r-- | amiga/tree.c | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index acbf84126..962c3a180 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -383,9 +383,8 @@ void ami_open_resources(void) IKeymap = (struct KeymapIFace *)GetInterface(KeymapBase,"main",1,NULL); } - if(ApplicationBase = OpenLibrary("application.library",50)) - { - IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase,"application",1,NULL); + if(ApplicationBase = OpenLibrary("application.library", 53)) { + IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase, "application", 2, NULL); } urlStringClass = MakeStringClass(); @@ -938,9 +937,6 @@ static void gui_init2(int argc, char** argv) if(IApplication) { - ULONG desc = REGAPP_Description; - if(ApplicationBase->lib_Version < 53) desc = TAG_IGNORE; - if(argc == 0) { ULONG noicon = TAG_IGNORE; @@ -955,7 +951,7 @@ static void gui_init2(int argc, char** argv) REGAPP_HasPrefsWindow, TRUE, REGAPP_CanCreateNewDocs, TRUE, REGAPP_UniqueApplication, TRUE, - desc, messages_get("NetSurfDesc"), + REGAPP_Description, messages_get("NetSurfDesc"), TAG_DONE); } else @@ -968,7 +964,7 @@ static void gui_init2(int argc, char** argv) REGAPP_HasPrefsWindow, TRUE, REGAPP_CanCreateNewDocs, TRUE, REGAPP_UniqueApplication, TRUE, - desc, messages_get("NetSurfDesc"), + REGAPP_Description, messages_get("NetSurfDesc"), TAG_DONE); } diff --git a/amiga/tree.c b/amiga/tree.c index 80d05a68f..5ef3a20d6 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1309,6 +1309,9 @@ void ami_tree_redraw_request(int x, int y, int width, int height, void *data) atrr_data->height = height; atrr_data->twin = (struct treeview_window *)data; + /**TODO: Queue these requests properly like the main browser code does + **/ + schedule(0, ami_tree_redraw_req, atrr_data); } |