author | bipolar <bipolar> | 2002-03-09 03:09:15 (UTC) |
---|---|---|
committer | bipolar <bipolar> | 2002-03-09 03:09:15 (UTC) |
commit | cb1d684a68565ff70fedd184eedf1ef4f2b71079 (patch) (unidiff) | |
tree | 51dc13c1eaa2408b6e753de751bcb7ac2d02f7e8 /core | |
parent | bc79d3f4a7503c4298a5396b80c65a3e268f4be3 (diff) | |
download | opie-cb1d684a68565ff70fedd184eedf1ef4f2b71079.zip opie-cb1d684a68565ff70fedd184eedf1ef4f2b71079.tar.gz opie-cb1d684a68565ff70fedd184eedf1ef4f2b71079.tar.bz2 |
ljp: hopefully took care of doclnk creating zero size files, while maintaining what was going on.
-rw-r--r-- | core/launcher/launcher.cpp | 4 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 7 |
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 | |||
@@ -757,14 +757,14 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
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 | ||
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 | |||
@@ -389,25 +389,22 @@ bool LauncherIconView::removeLink(const QString& linkfile) | |||
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 | } |