[Libreoffice-commits] online.git: 2 commits - kit/Kit.cpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 25 13:04:01 UTC 2018
kit/Kit.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3b901020d258e92a5d834c1f1f10baec0c290792
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Oct 25 16:01:02 2018 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Oct 25 16:02:45 2018 +0300
Actually it's enough to pass instdir as the 2nd parameter to lok_init_2()
The "/user" will be tacked on by core code anyway. We don't need two
levels of "/user".
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 49202084b..e37a88e98 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2454,7 +2454,7 @@ void lokit_main(
#else // MOBILEAPP
#ifdef __linux
- LibreOfficeKit *kit = lok_init_2(LO_PATH "/program", "file://" LO_PATH "/user");
+ LibreOfficeKit *kit = lok_init_2(LO_PATH "/program", "file://" LO_PATH);
#else
LibreOfficeKit *kit = lok_init_2(nullptr, nullptr);
#endif
commit 76ff3d5c2ac4e4fb83faaa35779491c4a991830a
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Oct 25 15:55:55 2018 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Oct 25 16:02:45 2018 +0300
The 2nd parameter to lok_init_2 should be a URL
Sure, there is some GLib API I could use to properly convert from a
pathname to a file: URL. But I am lazy, and this is not an end-user
program.
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index a1a43caca..49202084b 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2454,7 +2454,7 @@ void lokit_main(
#else // MOBILEAPP
#ifdef __linux
- LibreOfficeKit *kit = lok_init_2(LO_PATH "/program", LO_PATH "/user");
+ LibreOfficeKit *kit = lok_init_2(LO_PATH "/program", "file://" LO_PATH "/user");
#else
LibreOfficeKit *kit = lok_init_2(nullptr, nullptr);
#endif
More information about the Libreoffice-commits
mailing list