[X2Go-Commits] [x2goclient] 01/01: src/x2goutils.cpp: don't try to wrap absolute paths as legacy resource URIs in wrap_legacy_resource_URIs (). Fixes: #910.
git-admin at x2go.org
git-admin at x2go.org
Sun Dec 25 00:54:06 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 40f3d5c78497a1363091ebcf7769105009a11439
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun Dec 25 00:43:16 2016 +0100
src/x2goutils.cpp: don't try to wrap absolute paths as legacy resource URIs in wrap_legacy_resource_URIs (). Fixes: #910.
---
debian/changelog | 2 ++
src/x2goutils.cpp | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 9c0c954..a88869f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
prompts.
- src/sharewidget.cpp: fix compile on UNIX-like platforms by defaulting to
ISO-8859-1 not just on Linux but also other platforms. Fixes: #1124.
+ - src/x2goutils.cpp: don't try to wrap absolute paths as legacy resource
+ URIs in wrap_legacy_resource_URIs (). Fixes: #910.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index 31ac3ac..9f3b382 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -52,7 +52,12 @@ QString fixup_resource_URIs (const QString &res_path) {
QString wrap_legacy_resource_URIs (const QString &res_path) {
QString ret (res_path);
- if (!(res_path.isEmpty ())) {
+ /*
+ * Skip empty or non-resource URIs.
+ * Assume all paths not starting with a colon are
+ * absolute, non-resource URIs.
+ */
+ if ((!(res_path.isEmpty ())) && (res_path.startsWith (':'))) {
std::vector<QString> legacy_locations;
legacy_locations.push_back (QString (":/icons/"));
legacy_locations.push_back (QString (":/png/"));
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list