From 901dca08cc76e3efd2f040a2c3b695dec506a780 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 10 May 2022 00:45:06 +0300 Subject: [PATCH] kdirshare: better service publishing error reporting requires: https://github.com/fluxer/kdelibs/commit/23af14f8ed82b3d5923bca216fffb717b6b87c0e Signed-off-by: Ivailo Monev --- kdirshare/kded/kded_kdirshare.cpp | 2 +- kdirshare/kded/kdirshareimpl.cpp | 5 +++++ kdirshare/kded/kdirshareimpl.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/kdirshare/kded/kded_kdirshare.cpp b/kdirshare/kded/kded_kdirshare.cpp index dd6e2a27..9bef1f43 100644 --- a/kdirshare/kded/kded_kdirshare.cpp +++ b/kdirshare/kded/kded_kdirshare.cpp @@ -95,7 +95,7 @@ QString KDirShareModule::share(const QString &dirpath, const uint portmin, const if (!kdirshareimpl->publish()) { kdirshareimpl->stop(); delete kdirshareimpl; - return i18n("Could not publish service for: %1", dirpath); + return i18n("Could not publish service for: %1", kdirshareimpl->publishError()); } m_dirshares.append(kdirshareimpl); return QString(); diff --git a/kdirshare/kded/kdirshareimpl.cpp b/kdirshare/kded/kdirshareimpl.cpp index 676dbebe..2f15c1d3 100644 --- a/kdirshare/kded/kdirshareimpl.cpp +++ b/kdirshare/kded/kdirshareimpl.cpp @@ -172,6 +172,11 @@ quint16 KDirShareImpl::portMax() const return m_portmax; } +QString KDirShareImpl::publishError() const +{ + return m_kdnssd.errorString(); +} + void KDirShareImpl::respond(const QByteArray &url, QByteArray *outdata, ushort *outhttpstatus, KHTTPHeaders *outheaders) { // qDebug() << Q_FUNC_INFO << url; diff --git a/kdirshare/kded/kdirshareimpl.h b/kdirshare/kded/kdirshareimpl.h index b80185a3..d1072824 100644 --- a/kdirshare/kded/kdirshareimpl.h +++ b/kdirshare/kded/kdirshareimpl.h @@ -40,6 +40,8 @@ public: quint16 portMin() const; quint16 portMax() const; + QString publishError() const; + protected: void respond(const QByteArray &url, QByteArray *outdata, ushort *outhttpstatus, KHTTPHeaders *outheaders) final; -- 2.11.0