summaryrefslogtreecommitdiff
path: root/core
Unidiff
Diffstat (limited to 'core') (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/launcher.cpp4
-rw-r--r--core/launcher/launcherview.cpp7
2 files changed, 4 insertions, 7 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 0573330..8fe41f7 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -751,26 +751,26 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
751 contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n"; 751 contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n";
752 contents += "File = "+doc->file()+"\n"; 752 contents += "File = "+doc->file()+"\n";
753 contents += "Name = "+doc->name()+"\n"; 753 contents += "Name = "+doc->name()+"\n";
754 contents += "Type = "+doc->type()+"\n"; 754 contents += "Type = "+doc->type()+"\n";
755 } 755 }
756 contents += QString("Size = %1\n").arg( fi.size() ); 756 contents += QString("Size = %1\n").arg( fi.size() );
757 } 757 }
758 758
759 //qDebug( "sending length %d", contents.length() ); 759 //qDebug( "sending length %d", contents.length() );
760 QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" ); 760 QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
761 e << contents; 761 e << contents;
762 762
763 //qDebug( "================ \n\n%s\n\n===============", 763 qDebug( "================ \n\n%s\n\n===============",
764 //contents.latin1() ); 764 contents.latin1() );
765 765
766 delete docsFolder; 766 delete docsFolder;
767 docsFolder = 0; 767 docsFolder = 0;
768 } 768 }
769} 769}
770 770
771void Launcher::cancelSync() 771void Launcher::cancelSync()
772{ 772{
773 QCopEnvelope e( "QPE/Desktop", "cancelSync()" ); 773 QCopEnvelope e( "QPE/Desktop", "cancelSync()" );
774} 774}
775 775
776void Launcher::storageChanged() 776void Launcher::storageChanged()
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 764f088..538ad79 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -383,37 +383,34 @@ void LauncherIconView::hideOrShowItems(bool resort)
383 sort(); 383 sort();
384 setAutoArrange( oldAutoArrange ); 384 setAutoArrange( oldAutoArrange );
385} 385}
386 386
387bool LauncherIconView::removeLink(const QString& linkfile) 387bool LauncherIconView::removeLink(const QString& linkfile)
388{ 388{
389 LauncherItem* item = (LauncherItem*)firstItem(); 389 LauncherItem* item = (LauncherItem*)firstItem();
390 AppLnk* l; 390 AppLnk* l;
391 bool did = FALSE; 391 bool did = FALSE;
392 DocLnk dl(linkfile); 392 DocLnk dl(linkfile);
393 while (item) { 393 while (item) {
394 l = item->appLnk(); 394 l = item->appLnk();
395 if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile 395 if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
396 || dl.isValid() && dl.file() == l->file() ) {
397 delete item; 396 delete item;
398 did = TRUE; 397 did = TRUE;
399 } 398 }
400 item = (LauncherItem*)item->nextItem(); 399 item = (LauncherItem*)item->nextItem();
401 } 400 }
402 QListIterator<AppLnk> it(hidden); 401 QListIterator<AppLnk> it(hidden);
403 while ((l=it.current())) { 402 while ((l=it.current())) {
404 ++it; 403 ++it;
405 if ( l->linkFileKnown() && l->linkFile() == linkfile 404 if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
406 || l->file() == linkfile
407 || dl.isValid() && dl.file() == l->file() ) {
408 hidden.removeRef(l); 405 hidden.removeRef(l);
409 did = TRUE; 406 did = TRUE;
410 } 407 }
411 } 408 }
412 return did; 409 return did;
413} 410}
414 411
415LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) 412LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
416 : QVBox( parent, name, fl ) 413 : QVBox( parent, name, fl )
417{ 414{
418 icons = new LauncherIconView( this ); 415 icons = new LauncherIconView( this );
419 setFocusProxy(icons); 416 setFocusProxy(icons);