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

List:       kde-commits
Subject:    kdebase/kioslave/settings
From:       Martin Koller <m.koller () surfeu ! at>
Date:       2005-02-20 0:15:30
Message-ID: 20050220001530.187CA1B8A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by mkoller: 


BUGS: 97754
BUGS: 95921
store desktopEntryName() instead of name() in UDS_URL


  M +6 -5      kio_settings.cc   1.14


--- kdebase/kioslave/settings/kio_settings.cc  #1.13:1.14
@@ -168,5 +168,5 @@ KServiceGroup::Ptr SettingsProtocol::fin
 void SettingsProtocol::get( const KURL & url )
 {
-        KService::Ptr service = KService::serviceByName(url.fileName());
+        KService::Ptr service = KService::serviceByDesktopName(url.fileName());
         if (service && service->isValid()) {
                 KURL redirUrl;
@@ -196,5 +196,5 @@ void SettingsProtocol::stat(const KURL& 
                         url.url(), "inode/directory",grp->icon() );
         } else {
-                KService::Ptr service = KService::serviceByName( url.fileName() );
+                KService::Ptr service = KService::serviceByDesktopName( \
url.fileName() );  if (service && service->isValid()) {
 //                      KURL newUrl;
@@ -202,5 +202,6 @@ void SettingsProtocol::stat(const KURL& 
 //                      createFileEntry(entry, service->name(), newUrl, \
"application/x-desktop", service->icon());  
-                        createFileEntry(entry, service->name(), url.url(), \
"application/x-desktop", service->icon()); +                        \
createFileEntry(entry, service->name(), url.url(1)+service->desktopEntryName(), +     \
"application/x-desktop", service->icon());  } else {
                         error(KIO::ERR_SLAVE_DEFINED,i18n("Unknown settings \
folder")); @@ -284,5 +285,5 @@ void SettingsProtocol::listDir(const KUR
                         KService::Ptr s(static_cast<KService *>(e));
                         kdDebug() << "SettingsProtocol: adding file entry " << \
                url.url(1)+s->name() << endl;
-                        createFileEntry(entry,s->name(),url.url(1)+s->name(), \
"application/x-desktop",s->icon()); +                        \
createFileEntry(entry,s->name(),url.url(1)+s->desktopEntryName(), \
"application/x-desktop",s->icon());  }
 


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