[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kdnssd/ioslave
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2009-01-31 21:38:49
Message-ID: 1233437929.629315.2262.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 919403 by kossebau:

UDSEntry::UDS_URL is deprecated, use UDSEntry::UDS_DISPLAY_NAME instead

 M  +4 -4      dnssd.cpp  
 M  +1 -1      dnssd.h  


--- trunk/KDE/kdenetwork/kdnssd/ioslave/dnssd.cpp #919402:919403
@@ -217,7 +217,7 @@
 
     // action
     UDSEntry entry;
-    feedEntryAsDir( &entry, knownProtocols[serviceType].name, serviceType );
+    feedEntryAsDir( &entry, serviceType, knownProtocols[serviceType].name );
     listEntry( entry, false );
 }
 
@@ -257,15 +257,15 @@
     emit leaveModality();
 }
 
-void ZeroConfProtocol::feedEntryAsDir( UDSEntry* entry, const QString& name, const \
QString& serviceType ) +void ZeroConfProtocol::feedEntryAsDir( UDSEntry* entry, const \
QString& name, const QString& displayName )  {
     entry->insert( UDSEntry::UDS_NAME,      name );
     entry->insert( UDSEntry::UDS_ACCESS,    0555 );
     entry->insert( UDSEntry::UDS_SIZE,      0 );
     entry->insert( UDSEntry::UDS_FILE_TYPE, S_IFDIR );
     entry->insert( UDSEntry::UDS_MIME_TYPE, "inode/directory" );
-    if (!serviceType.isNull())
-        entry->insert( UDSEntry::UDS_URL,   ZeroConfUrl::createUrl(serviceType) );
+    if (!displayName.isEmpty())
+        entry->insert( UDSEntry::UDS_DISPLAY_NAME, displayName );
 }
 
 void ZeroConfProtocol::enterLoop()
--- trunk/KDE/kdenetwork/kdnssd/ioslave/dnssd.h #919402:919403
@@ -70,7 +70,7 @@
 
 private:
     // Create UDSEntry for zeroconf:/ or zeroconf:/type/ urls
-    void feedEntryAsDir( UDSEntry* entry, const QString& name, const QString& \
serviceType = QString() ); +    void feedEntryAsDir( UDSEntry* entry, const QString& \
name, const QString& displayName = QString() );  // resolve given service and \
redirect() to it  void resolveAndRedirect( const ZeroConfUrl& zeroConfUrl );
 


[prev in list] [next in list] [prev in thread] [next in thread]