summaryrefslogtreecommitdiff
path: root/frontends/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-07-03 22:08:29 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2016-07-03 22:08:29 +0100
commit59b29930d7c89c53f85d4536bb3657b1c0bd2736 (patch)
tree59f18eda5b99ab6e12786941dcf0db896ad69865 /frontends/amiga
parenteb9571ede701defafd2b9685138826a719124b5b (diff)
downloadnetsurf-59b29930d7c89c53f85d4536bb3657b1c0bd2736.tar.gz
netsurf-59b29930d7c89c53f85d4536bb3657b1c0bd2736.tar.bz2
Fix the signalling to the old session of NetSurf from the newly-launched one.
No idea how this ever worked previously, as it was sending commands to the ARexx server instead of NetSurf.
Diffstat (limited to 'frontends/amiga')
-rw-r--r--frontends/amiga/arexx.c12
-rwxr-xr-xfrontends/amiga/arexx.h2
-rw-r--r--frontends/amiga/gui.c3
3 files changed, 12 insertions, 5 deletions
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 14c0ad770..1f2d95b86 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -133,6 +133,7 @@ bool ami_arexx_init(ULONG *rxsig)
AREXX_ReplyHook,NULL,
AREXX_DefExtension,"nsrx",
End;
+
return false;
}
}
@@ -142,10 +143,15 @@ void ami_arexx_handle(void)
RA_HandleRexx(arexx_obj);
}
-void ami_arexx_command(const char *cmd)
+static void ami_arexx_command(const char *cmd, const char *port)
{
if(arexx_obj == NULL) return;
- IDoMethod(arexx_obj, AM_EXECUTE, cmd, NULL, NULL, NULL, NULL, NULL);
+ IDoMethod(arexx_obj, AM_EXECUTE, cmd, port, NULL, NULL, NULL, NULL);
+}
+
+void ami_arexx_self(const char *cmd)
+{
+ ami_arexx_command(cmd, "NETSURF");
}
void ami_arexx_execute(char *script)
@@ -156,7 +162,7 @@ void ami_arexx_execute(char *script)
if((lock = Lock(script, ACCESS_READ))) {
DevNameFromLock(lock, full_script_path, 1024, DN_FULLPATH);
LOG("Executing script: %s", full_script_path);
- ami_arexx_command(full_script_path);
+ ami_arexx_command(full_script_path, NULL);
UnLock(lock);
}
}
diff --git a/frontends/amiga/arexx.h b/frontends/amiga/arexx.h
index e6c9c7e24..b97967a56 100755
--- a/frontends/amiga/arexx.h
+++ b/frontends/amiga/arexx.h
@@ -25,6 +25,6 @@
bool ami_arexx_init(ULONG *rxsig);
void ami_arexx_handle(void);
void ami_arexx_execute(char *);
-void ami_arexx_command(const char *cmd);
+void ami_arexx_self(const char *cmd);
void ami_arexx_cleanup(void);
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 9bf1689f1..a05761aa7 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1076,7 +1076,8 @@ static void gui_init2(int argc, char** argv)
} else {
sendcmd = ASPrintf("OPEN \"%s\" NEW",nsoption_charp(homepage_url));
}
- ami_arexx_command(sendcmd);
+ ami_arexx_self(sendcmd);
+
FreeVec(sendcmd);
ami_quit=true;