From aa96333e7cee04b93be9bd9eff62e3e7e6b7cb87 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 16 May 2022 23:32:50 +0300 Subject: [PATCH] kdirshare: clamp the title aswell Signed-off-by: Ivailo Monev --- kdirshare/kded/kdirshareimpl.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/kdirshare/kded/kdirshareimpl.cpp b/kdirshare/kded/kdirshareimpl.cpp index 618b6766..d59f2b31 100644 --- a/kdirshare/kded/kdirshareimpl.cpp +++ b/kdirshare/kded/kdirshareimpl.cpp @@ -33,18 +33,6 @@ static const QByteArray s_data500("500 Internal Server Error"); // AVAHI_LABEL_MAX - 3 (for dots) - 1 (for null terminator) static const int s_sharenamelimit = 60; -static QString getShareName(const QString &dirpath) -{ - const QString absolutedirpath = QDir(dirpath).absolutePath(); - QString dirname = QDir(absolutedirpath).dirName(); - if (dirname.size() > s_sharenamelimit) { - dirname = dirname.left(s_sharenamelimit); - dirname.append(QLatin1String("...")); - } - // qDebug() << Q_FUNC_INFO << dirname; - return dirname; -} - static QString getFileMIME(const QString &filepath) { const KMimeType::Ptr kmimetypeptr = KMimeType::findByUrl( @@ -59,7 +47,13 @@ static QString getFileMIME(const QString &filepath) static QString getTitle(const QString &dirpath) { - return i18n("KDirShare@%1 (%2)", QHostInfo::localHostName(), getShareName(dirpath)); + const QString sharename = QDir(QDir(dirpath).absolutePath()).dirName(); + QString title = i18n("KDirShare@%1 (%2)", QHostInfo::localHostName(), sharename); + if (title.size() > s_sharenamelimit) { + title = title.left(s_sharenamelimit); + title.append(QLatin1String("...")); + } + return title; } static QByteArray contentForDirectory(const QString &path, const QString &basedir) -- 2.11.0