1 files changed, 21 insertions, 10 deletions

diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 44ceb0c..d8e7a83 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -378,63 +378,63 @@ void DocumentList::DiffAppLnks()
     AppLnk *j;
     bool found;
 
     while ( (j=it2.current()) ) {
 	it1 = appLnkSet->children();
 	found = false;
 	while ( (i=it1.current()) ){
 	    if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
 		found = true;
 	    ++it1;
 	}
 	if (!found) {
-	    odebug << "Item " << j->name().ascii() << " needs to be added" << oendl; 
+	    odebug << "Item " << j->name().ascii() << " needs to be added" << oendl;
 	    d->serverGui->applicationAdded( j->type(), *j );
-	}		    
-	    ++it2; 
+	}
+	    ++it2;
     }
 
     it1 = appLnkSet->children();
      while ( (i=it1.current()) ) {
 	it2 = appLnkSet2->children();
 	found = false;
 	while ( (j=it2.current()) ){
 	    if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
 		found = true;
 	    ++it2;
 	}
 	if (!found) {
-	    odebug << "Item " << i->name().ascii() << " needs to be removed" << oendl; 
+	    odebug << "Item " << i->name().ascii() << " needs to be removed" << oendl;
 	    d->serverGui->applicationRemoved( i->type(), *i );
 	}
-		    
-	    ++it1; 
+
+	    ++it1;
     }
-    
+
     delete appLnkSet;
     appLnkSet = appLnkSet2;
 
 }
 void DocumentList::storageChanged()
 {
     QTime t;
     // ### can implement better
 
     t.start();
     DiffAppLnks();
 //    reloadAppLnks();
-    odebug << "Reload App links took " << t.elapsed() << " ms" << oendl; 
+    odebug << "Reload App links took " << t.elapsed() << " ms" << oendl;
     reloadDocLnks();
 //    odebug << "Reload links took " << t.elapsed() << " ms " << oendl;
-    odebug << "Reload All links took " << t.elapsed() << " ms" << oendl; 
+    odebug << "Reload All links took " << t.elapsed() << " ms" << oendl;
 // ### Optimization opportunity
     // Could be a bit more intelligent and somehow work out which
     // mtab entry has changed and then only scan that and add and remove
     // links appropriately.
 //    rescan();
 }
 
 void DocumentList::sendAllDocLinks()
 {
     if ( d->tid != 0 ) {
 	// We are in the middle of scanning, set a flag so
 	// we do this when we finish our scanning
@@ -447,25 +447,36 @@ void DocumentList::sendAllDocLinks()
     for ( QListIterator<DocLnk> it( d->dls.children() ); it.current(); ++it ) {
 	DocLnk *doc = it.current();
 	QFileInfo fi( doc->file() );
 	if ( !fi.exists() )
 	    continue;
 
 	bool fake = !doc->linkFileKnown();
 	if ( !fake ) {
 	    QFile f( doc->linkFile() );
 	    if ( f.open( IO_ReadOnly ) ) {
 		QTextStream ts( &f );
 		ts.setEncoding( QTextStream::UnicodeUTF8 );
-		contents += ts.read();
+		QString docLnk = ts.read();
+		// Strip out the (stale) LinkFile entry
+		int start = docLnk.find( "\nLinkFile = " ) + 1;
+		if ( start > 0 ) {
+		    int end = docLnk.find( "\n", start + 1 ) + 1;
+		    contents += docLnk.left(start);
+		    contents += docLnk.mid(end);
+		} else {
+		    contents += docLnk;
+		}
+		contents += "LinkFile = " + doc->linkFile() + "\n";
+
 		f.close();
 	    } else
 		fake = TRUE;
 	}
 	if (fake) {
 	    contents += "[Desktop Entry]\n"; // No tr
 	    contents += "Categories = " + // No tr
 		cats.labels("Document View",doc->categories()).join(";") + "\n"; // No tr
 	    contents += "Name = "+doc->name()+"\n"; // No tr
 	    contents += "Type = "+doc->type()+"\n"; // No tr
 	}
 	contents += "File = "+doc->file()+"\n"; // No tr // (resolves path)