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

List:       kde-commits
Subject:    kdenetwork/kdnssd
From:       Jakub Stachowski <qbast () go2 ! pl>
Date:       2004-12-17 13:15:39
Message-ID: 20041217131539.722C81BC12 () office ! kde ! org
[Download RAW message or body]

CVS commit by qbast: 

Removed link to lan:/ - remote:/ should take care of this.
Added .desktop file for remote:/


  M +3 -0      ioslave/Makefile.am   1.8
  M +1 -33     ioslave/dnssd.cpp   1.24
  M +1 -2      ioslave/dnssd.h   1.14
  M +0 -1      kdedmodule/dnssdwatcher.cpp   1.2


--- kdenetwork/kdnssd/ioslave/Makefile.am  #1.7:1.8
@@ -13,4 +13,7 @@
 servicesdir = $(kde_datadir)/dnssd
 
+remote_DATA = dnssd.desktop
+remotedir = $(kde_datadir)/remoteview
+
 messages: rc.cpp
         $(XGETTEXT) *.cpp -o $(podir)/kio_dnssd.pot

--- kdenetwork/kdnssd/ioslave/dnssd.cpp  #1.23:1.24
@@ -97,8 +97,4 @@ void kio_dnssdProtocol::get(const KURL& 
                 resolveAndRedirect(url);
                 break;
-        case Lisa:
-                redirectToLisa(url);
-                kdDebug() << "Lisa requested\n";
-                break;
         default:
                 error(ERR_MALFORMED_URL,i18n("invalid URL"));
@@ -108,6 +104,5 @@ void kio_dnssdProtocol::mimetype(const K
 {
         kdDebug() << "Mimetype query\n";
-        if (checkURL(url)==Lisa) redirectToLisa(url);
-        else resolveAndRedirect(url);
+        resolveAndRedirect(url);
 }
 
@@ -119,5 +114,4 @@ UrlType kio_dnssdProtocol::checkURL(cons
         const QString& type = path.section("/",1,1);
         const QString& proto = type.section(".",1,-1);
-        if (type=="computers") return Lisa;
         if (type[0]!="_" || (proto!="_udp" && proto!="_tcp")) return Invalid;
         const QString& domain = url.host();
@@ -166,8 +160,4 @@ void kio_dnssdProtocol::stat(const KURL&
                 break;
         }
-        case Lisa:
-                kdDebug() << "Lisa requested\n";
-                redirectToLisa(url);
-                break;
         default:
                 error(ERR_MALFORMED_URL,i18n("invalid URL"));
@@ -260,18 +250,4 @@ QString kio_dnssdProtocol::getProtocol(c
 }
 
-// URL for Lisa : dnssd://hostname/computers/path
-
-void kio_dnssdProtocol::redirectToLisa(const KURL &url)
-{
-        KURL newURL;
-        newURL.setProtocol("lan");
-        newURL.setHost(url.host());
-        newURL.setPath("/"+url.path().section("/",2,-1));
-        kdDebug() << "URL rewritten for Lisa: " << newURL.prettyURL() << "\n";
-        redirection(newURL);
-        finished();
-}
-
-
 void kio_dnssdProtocol::buildServiceEntry(UDSEntry& entry,const QString& name,const \
QString& type,const QString& domain)  {
@@ -314,8 +290,4 @@ void kio_dnssdProtocol::listDir(const KU
         case RootDir:
                 kdDebug() << "Listing root dir\n";
-                if (url.host().isEmpty()) {   // "Computers" pseudo-service only for \
                all domains
-                        buildDirEntry(entry,i18n("Network Hosts"),"computers");
-                        listEntry(entry,false);
-                }
                 if (url.host().isEmpty())
                         browser = new \
DNSSD::ServiceBrowser(DNSSD::ServiceBrowser::AllServices); @@ -331,8 +303,4 @@ void \
                kio_dnssdProtocol::listDir(const KU
                         this,SLOT(newService(DNSSD::RemoteService::Ptr)));
                 break;
-        case Lisa:
-                kdDebug() << "Lisa requested\n";
-                redirectToLisa(url);
-                return;
         default:
                 error(ERR_MALFORMED_URL,i18n("invalid URL"));

--- kdenetwork/kdnssd/ioslave/dnssd.h  #1.13:1.14
@@ -37,5 +37,5 @@ class QCString;
 using namespace KIO;
 
-enum UrlType { RootDir, ServiceDir, Service, HelperProtocol, Invalid, Lisa };
+enum UrlType { RootDir, ServiceDir, Service, HelperProtocol, Invalid };
 
 class kio_dnssdProtocol : public QObject, public KIO::SlaveBase
@@ -62,5 +62,4 @@ private:
         void resolveAndRedirect(const KURL& url, bool useKRun = false);
         QString getProtocol(const QString& type);
-        void redirectToLisa(const KURL& url);
         DNSSD::ServiceBrowser* browser;
         // service types merged from all domains - to avoid duplicates

--- kdenetwork/kdnssd/kdedmodule/dnssdwatcher.cpp  #1.1:1.2
@@ -94,5 +94,4 @@ void DNSSDWatcher::createNotifier(const 
         QString domain,type,name;
         dissect(url,name,type,domain);  
-        if (!name.isEmpty() || type=="computers") return; 
         if (type.isEmpty()) type = DNSSD::ServiceBrowser::AllServices;
         DNSSD::ServiceBrowser *b;


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