Sync-merge.

This commit is contained in:
Jacob Sparre Andersen 2017-01-19 07:58:20 +01:00
commit 0946e46ca6
2 changed files with 10 additions and 3 deletions

View File

@ -58,6 +58,12 @@ package body Arun.Handlers is
Full_Path : aliased constant String := L.Find_Full_Path (Command);
begin
if Command (1) = '/' then
-- If the command starts with a slash, it's likely already a
-- full path so just try to execute it!
L.Execute (Command, Slices);
end if;
if Full_Path /= "" then
Put_Line ("Should Execute: " & Full_Path);
L.Execute (Full_Path, Slices);

View File

@ -57,9 +57,10 @@ package body Arun is
Builder.Launcher.Initialize;
Return_Code :=
Add_From_Resource (Builder => Builder,
Resource_Path => "/io/lasagna/arun/arun.glade",
Error => Error'Access);
Add_From_Resource
(Builder => Builder,
Resource_Path => "/io/lasagna/arun/resources/arun.glade",
Error => Error'Access);
if Error /= null then
Put_Line ("Error : " & Get_Message (Error));
Error_Free (Error);