SVN commit 1229765 by ervin:
Reverting r1229662. As Friedrich pointed out we'd better use the network
ioslave for that now... I overlooked it somehow.
CCMAIL: plasma-devel@kde.org
CCMAIL: kosse...@kde.org
M +1 -9 dnssd.cpp
M +2 -5 dnssd.h
--- trunk/KDE/kdenetwork/kdnssd/ioslave/dnssd.cpp #1229764:1229765
@@ -24,7 +24,6 @@
#include "zeroconfurl.h"
// KDE
#include <KComponentData>
-#include <KIcon>
#include <KProtocolInfo>
// Qt
#include <QtCore/QCoreApplication>
@@ -56,7 +55,6 @@
knownProtocols["_sftp-ssh._tcp"]=ProtocolData(i18n("Remote disk (sftp)"),
"sftp", QString(), "u", "p");
knownProtocols["_ssh._tcp"]= ProtocolData(i18n("Remote disk (fish)"),
"fish", QString(), "u", "p");
knownProtocols["_nfs._tcp"]= ProtocolData(i18n("NFS remote
directory"), "nfs", "path");
- knownProtocols["_plasma._tcp"]= ProtocolData(i18n("Plasma remote
widget"), "plasma", "plasmoidname", QString(), QString(), true);
}
ZeroConfProtocol::~ZeroConfProtocol()
@@ -228,16 +226,10 @@
UDSEntry entry;
entry.insert( UDSEntry::UDS_NAME, service->serviceName() );
entry.insert( UDSEntry::UDS_ACCESS, 0666);
-
- if (!knownProtocols[service->type()].servicesAsFiles)
entry.insert( UDSEntry::UDS_FILE_TYPE, S_IFDIR );
-
- const QString protocol = knownProtocols[service->type()].protocol;
- const QString iconName = KProtocolInfo::icon( protocol );
+ const QString iconName = KProtocolInfo::icon(
knownProtocols[service->type()].protocol );
if (!iconName.isNull())
entry.insert( UDSEntry::UDS_ICON_NAME, iconName );
- else if (!KIcon(protocol).isNull())
- entry.insert( UDSEntry::UDS_ICON_NAME, protocol );
listEntry( entry, false );
}
--- trunk/KDE/kdenetwork/kdnssd/ioslave/dnssd.h #1229764:1229765
@@ -39,10 +39,8 @@
{
ProtocolData() {}
ProtocolData( const QString& _name, const QString& proto,
- const QString& path=QString(),
- const QString& user=QString(), const QString&
passwd=QString(),
- bool files = false )
- : name(_name), protocol(proto), pathEntry(path), userEntry(user),
passwordEntry(passwd), servicesAsFiles(files)
+ const QString& path=QString(), const QString&
user=QString(), const QString& passwd=QString() )
+ : name(_name), protocol(proto), pathEntry(path), userEntry(user),
passwordEntry(passwd)
{}
void feedUrl( KUrl* url, const RemoteService* remoteService ) const;
@@ -52,7 +50,6 @@
QString pathEntry;
QString userEntry;
QString passwordEntry;
- bool servicesAsFiles;
};
class ZeroConfProtocol : public QObject, public KIO::SlaveBase
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
