Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > by-pkgid > ee5019e51831f214d532979b59ea2d61 > files > 42

kdelibs-3.4.2-31.4.20060mdk.src.rpm

--- kdelibs-3.4.2/kio/kfile/kfilespeedbar.cpp.add_kfilespeedbar_item	2005-08-26 19:42:23.000000000 +0200
+++ kdelibs-3.4.2/kio/kfile/kfilespeedbar.cpp	2005-08-26 19:47:44.000000000 +0200
@@ -28,6 +28,7 @@
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
+#include <kdesktopfile.h>
 
 KFileSpeedBar::KFileSpeedBar( QWidget *parent, const char *name )
     : KURLBar( true, parent, name )
@@ -73,6 +74,22 @@ KFileSpeedBar::KFileSpeedBar( QWidget *p
         if ( KProtocolInfo::isKnownProtocol( u ) )
             insertItem( u, i18n("Network Folders"), false,
                                    KProtocolInfo::icon( "remote" ) );
+		QDir homeDir(QDir::homeDirPath()+"/.mdk-folders/");
+		if( homeDir.exists())
+		{
+			QStringList listDesktopFile = homeDir.entryList ( "*-mdk.desktop");
+			QStringList::Iterator end(listDesktopFile.end());
+			listDesktopFile.remove("documents-mdk.desktop");
+			listDesktopFile.remove("desktop-mdk.desktop");
+			for ( QStringList::Iterator it = listDesktopFile.begin(); it != end; ++it ) 
+			{
+				KDesktopFile tmpFile(homeDir.path ()+"/"+*it);
+				QString url = tmpFile.readURL();
+				QString icon = tmpFile.readIcon();
+				QString name = tmpFile.readName();
+				insertItem( url, name, false, icon );
+        	}
+		}
     }
 }
 
--- kdelibs-3.4.2/kio/kfile/kurlbar.cpp--	2005-08-26 19:54:02.000000000 +0200
+++ kdelibs-3.4.2/kio/kfile/kurlbar.cpp	2005-08-26 19:55:44.000000000 +0200
@@ -604,7 +604,8 @@ void KURLBar::readItem( int i, KConfig *
 {
     QString number = QString::number( i );
     KURL url = KURL::fromPathOrURL( config->readPathEntry( QString("URL_") + number ));
-    if ( !url.isValid() || !KProtocolInfo::isKnownProtocol( url ))
+    if ( !url.isValid() || !KProtocolInfo::isKnownProtocol( url ) ||
+			(url.isLocalFile() && !QFile(url.path()).exists()))
         return; // nothing we could do.
 
     insertItem( url,