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.
This commit is contained in:
Chris Young 2013-10-12 10:26:28 +01:00
parent 4cc0d9c233
commit af2c37167b
2 changed files with 7 additions and 8 deletions

View File

@ -383,9 +383,8 @@ void ami_open_resources(void)
IKeymap = (struct KeymapIFace *)GetInterface(KeymapBase,"main",1,NULL); IKeymap = (struct KeymapIFace *)GetInterface(KeymapBase,"main",1,NULL);
} }
if(ApplicationBase = OpenLibrary("application.library",50)) if(ApplicationBase = OpenLibrary("application.library", 53)) {
{ IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase, "application", 2, NULL);
IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase,"application",1,NULL);
} }
urlStringClass = MakeStringClass(); urlStringClass = MakeStringClass();
@ -938,9 +937,6 @@ static void gui_init2(int argc, char** argv)
if(IApplication) if(IApplication)
{ {
ULONG desc = REGAPP_Description;
if(ApplicationBase->lib_Version < 53) desc = TAG_IGNORE;
if(argc == 0) if(argc == 0)
{ {
ULONG noicon = TAG_IGNORE; ULONG noicon = TAG_IGNORE;
@ -955,7 +951,7 @@ static void gui_init2(int argc, char** argv)
REGAPP_HasPrefsWindow, TRUE, REGAPP_HasPrefsWindow, TRUE,
REGAPP_CanCreateNewDocs, TRUE, REGAPP_CanCreateNewDocs, TRUE,
REGAPP_UniqueApplication, TRUE, REGAPP_UniqueApplication, TRUE,
desc, messages_get("NetSurfDesc"), REGAPP_Description, messages_get("NetSurfDesc"),
TAG_DONE); TAG_DONE);
} }
else else
@ -968,7 +964,7 @@ static void gui_init2(int argc, char** argv)
REGAPP_HasPrefsWindow, TRUE, REGAPP_HasPrefsWindow, TRUE,
REGAPP_CanCreateNewDocs, TRUE, REGAPP_CanCreateNewDocs, TRUE,
REGAPP_UniqueApplication, TRUE, REGAPP_UniqueApplication, TRUE,
desc, messages_get("NetSurfDesc"), REGAPP_Description, messages_get("NetSurfDesc"),
TAG_DONE); TAG_DONE);
} }

View File

@ -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->height = height;
atrr_data->twin = (struct treeview_window *)data; 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); schedule(0, ami_tree_redraw_req, atrr_data);
} }