summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/gui.c9
-rw-r--r--amiga/libs.c2
-rw-r--r--amiga/menu.c1
3 files changed, 11 insertions, 1 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 28921197d..c533c7f65 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3701,6 +3701,8 @@ gui_window_create(struct browser_window *bw,
BitMapEnd;
}
+ LOG(("Creating window object"));
+
g->shared->objects[OID_MAIN] = WindowObject,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Activate, TRUE,
@@ -3955,8 +3957,12 @@ gui_window_create(struct browser_window *bw,
EndWindow;
}
+ LOG(("Opening window"));
+
g->shared->win = (struct Window *)RA_OpenWindow(g->shared->objects[OID_MAIN]);
+ LOG(("Window opened, adding border gadgets"));
+
if(!g->shared->win)
{
warn_user("NoMemory","");
@@ -5390,7 +5396,10 @@ int main(int argc, char** argv)
ami_mime_init("PROGDIR:Resources/mimetypes");
sprintf(temp, "%s/mimetypes.user", current_user_dir);
ami_mime_init(temp);
+
+#ifdef __amigaos4__
amiga_plugin_hack_init();
+#endif
ret = amiga_datatypes_init();
/* user options setup */
diff --git a/amiga/libs.c b/amiga/libs.c
index 0f5131df8..4278d1aee 100644
--- a/amiga/libs.c
+++ b/amiga/libs.c
@@ -120,6 +120,7 @@ bool ami_libs_open(void)
#ifdef __amigaos4__
/* Libraries only needed on OS4 */
AMINS_LIB_OPEN("application.library", 53, Application, "application", 2, false)
+ AMINS_LIB_OPEN("Picasso96API.library", 0, P96, "main", 1, true)
#else
/* Libraries we get automatically on OS4 but not OS3 */
AMINS_LIB_OPEN("utility.library", 37, Utility, "main", 1, true)
@@ -136,7 +137,6 @@ bool ami_libs_open(void)
AMINS_LIB_OPEN("keymap.library", 37, Keymap, "main", 1, true)
AMINS_LIB_OPEN("layers.library", 37, Layers, "main", 1, true)
AMINS_LIB_OPEN("locale.library", 37, Locale, "main", 1, true)
- AMINS_LIB_OPEN("Picasso96API.library", 0, P96, "main", 1, true)
AMINS_LIB_OPEN("workbench.library", 37, Workbench, "main", 1, true)
/* NB: timer.device is opened in schedule.c (ultimately by the scheduler process).
diff --git a/amiga/menu.c b/amiga/menu.c
index e5d35a974..1fef12baf 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -42,6 +42,7 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
+
#include "desktop/hotlist.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"