diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-03-29 11:06:09 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-03-29 11:06:09 +0300 |
commit | 6dc49edb93b6e9099a97b502fde246619bbc49c8 (patch) | |
tree | d7f832467f00668ce9abe7f54ba8af71186e0e4a /src | |
parent | fb38f92c3a5c29c568575df87f0c29e777ebd969 (diff) | |
parent | d2a1a0ac7f1423d91229a83b299b3901e30ed28f (diff) |
Merge branch 'dev' of codeberg.org:skyjake/lagrange into dev
Diffstat (limited to 'src')
-rw-r--r-- | src/app.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -89,6 +89,10 @@ static const char *defaultDataDir_App_ = "~/AppData/Roaming/fi.skyjake.Lagrange" | |||
89 | #define EMB_BIN "../../share/lagrange/resources.lgr" | 89 | #define EMB_BIN "../../share/lagrange/resources.lgr" |
90 | static const char *defaultDataDir_App_ = "~/.config/lagrange"; | 90 | static const char *defaultDataDir_App_ = "~/.config/lagrange"; |
91 | #endif | 91 | #endif |
92 | #if defined (iPlatformHaiku) | ||
93 | #define EMB_BIN "./resources.lgr" | ||
94 | static const char *defaultDataDir_App_ = "~/config/settings"; | ||
95 | #endif | ||
92 | #if defined (LAGRANGE_EMB_BIN) /* specified in build config */ | 96 | #if defined (LAGRANGE_EMB_BIN) /* specified in build config */ |
93 | # undef EMB_BIN | 97 | # undef EMB_BIN |
94 | # define EMB_BIN LAGRANGE_EMB_BIN | 98 | # define EMB_BIN LAGRANGE_EMB_BIN |
@@ -2128,7 +2132,7 @@ void openInDefaultBrowser_App(const iString *url) { | |||
2128 | setArguments_Process(proc, | 2132 | setArguments_Process(proc, |
2129 | #if defined (iPlatformAppleDesktop) | 2133 | #if defined (iPlatformAppleDesktop) |
2130 | iClob(newStringsCStr_StringList("/usr/bin/env", "open", cstr_String(url), NULL)) | 2134 | iClob(newStringsCStr_StringList("/usr/bin/env", "open", cstr_String(url), NULL)) |
2131 | #elif defined (iPlatformLinux) || defined (iPlatformOther) | 2135 | #elif defined (iPlatformLinux) || defined (iPlatformOther) || defined (iPlatformHaiku) |
2132 | iClob(newStringsCStr_StringList("/usr/bin/env", "xdg-open", cstr_String(url), NULL)) | 2136 | iClob(newStringsCStr_StringList("/usr/bin/env", "xdg-open", cstr_String(url), NULL)) |
2133 | #elif defined (iPlatformMsys) | 2137 | #elif defined (iPlatformMsys) |
2134 | iClob(newStringsCStr_StringList( | 2138 | iClob(newStringsCStr_StringList( |
@@ -2165,7 +2169,7 @@ void revealPath_App(const iString *path) { | |||
2165 | iRelease(proc); | 2169 | iRelease(proc); |
2166 | } | 2170 | } |
2167 | iRelease(f); | 2171 | iRelease(f); |
2168 | #elif defined (iPlatformLinux) | 2172 | #elif defined (iPlatformLinux) || defined (iPlatformHaiku) |
2169 | iFileInfo *inf = iClob(new_FileInfo(path)); | 2173 | iFileInfo *inf = iClob(new_FileInfo(path)); |
2170 | iRangecc target; | 2174 | iRangecc target; |
2171 | if (isDirectory_FileInfo(inf)) { | 2175 | if (isDirectory_FileInfo(inf)) { |