Commit 84c0c2cc authored by Andrew Choi's avatar Andrew Choi
Browse files

2002-06-17 Andrew Choi <akochoi@shaw.ca>

        * mac.c (do_applescript): Call initialize_applescript if necessary
        when first called.  Dispose of result_desc only when there is no
        error.
        (Fdo_applescript): Use %d format specifier instead of %ld.
parent b6cce0b7
2002-06-17 Andrew Choi <akochoi@shaw.ca>
* mac.c (do_applescript): Call initialize_applescript if necessary
when first called. Dispose of result_desc only when there is no
error.
(Fdo_applescript): Use %d format specifier instead of %ld.
2002-06-16 Andrew Choi <akochoi@shaw.ca>
* macterm.c (XTread_socket): Call FrontNonFloatingWindow instead
......
......@@ -2446,6 +2446,9 @@ do_applescript (char *script, char **result)
*result = 0;
if (!as_scripting_component)
initialize_applescript();
error = AECreateDesc (typeChar, script, strlen(script), &script_desc);
if (error)
return error;
......@@ -2502,10 +2505,10 @@ do_applescript (char *script, char **result)
}
HUnlock (result_desc.dataHandle);
#endif /* not TARGET_API_MAC_CARBON */
AEDisposeDesc (&result_desc);
}
AEDisposeDesc (&script_desc);
AEDisposeDesc (&result_desc);
return osaerror;
}
......@@ -2530,7 +2533,7 @@ component. */)
if (status)
{
if (!result)
error ("AppleScript error %ld", status);
error ("AppleScript error %d", status);
else
{
/* Unfortunately only OSADoScript in do_applescript knows how
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment