4 files changed, 12 insertions, 9 deletions
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
index 5b042295d..22bd19e7b 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 
 #include <kdirnotify_stub.h>
 
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
index a93ec7eae..e3e32fb5c 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
@@ -28,7 +28,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
 }
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
+	TDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
 	{
 		TDEGlobal::locale()->insertCatalogue("tdeio_remote");
 		return new RemoteDirNotifyModule(obj);
diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp
index a0f37b624..659273834 100644
--- a/tdeioslave/remote/remoteimpl.cpp
+++ b/tdeioslave/remote/remoteimpl.cpp
@@ -21,8 +21,8 @@
 
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 #include <kservice.h>
 #include <tdelocale.h>
 
@@ -140,7 +140,7 @@ KURL RemoteImpl::findBaseURL(const TQString &filename) const
 	TQString file = findDesktopFile(filename);
 	if (!file.isEmpty())
 	{
-		KDesktopFile desktop(file, true);
+		TDEDesktopFile desktop(file, true);
 		return desktop.readURL();
 	}
 	
@@ -218,7 +218,8 @@ void RemoteImpl::createEntry(TDEIO::UDSEntry &entry,
 {
 	kdDebug(1220) << "RemoteImpl::createEntry" << endl;
 
-	KDesktopFile desktop(directory+file, true);
+	TQString desktopPath(directory + file);
+	TDEDesktopFile desktop(desktopPath, true);
 
 	kdDebug(1220) << "path = " << directory << file << endl;
 
@@ -237,6 +238,8 @@ void RemoteImpl::createEntry(TDEIO::UDSEntry &entry,
 
 	addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon);
 	addAtom(entry, TDEIO::UDS_LINK_DEST, 0, desktop.readURL());
+
+	addAtom(entry, TDEIO::UDS_LOCAL_PATH, 0, desktopPath);
 }
 
 bool RemoteImpl::statNetworkFolder(TDEIO::UDSEntry &entry, const TQString &filename) const
@@ -286,7 +289,7 @@ bool RemoteImpl::renameFolders(const TQString &src, const TQString &dest,
 		bool res = dir.rename(src+".desktop", dest+".desktop");
 		if (res)
 		{
-			KDesktopFile desktop(directory+dest+".desktop");
+			TDEDesktopFile desktop(directory+dest+".desktop");
 			desktop.writeEntry("Name", dest);
 		}
 		return res;
diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp
index 271b0913f..258102a97 100644
--- a/tdeioslave/remote/tdeio_remote.cpp
+++ b/tdeioslave/remote/tdeio_remote.cpp
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
 };
 
 extern "C" {
-	int KDE_EXPORT kdemain( int argc, char **argv )
+	int TDE_EXPORT kdemain( int argc, char **argv )
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));