-rw-r--r-- | library/global.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/global.cpp b/library/global.cpp index 5ac969b..ec87555 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -542,65 +542,65 @@ void Global::invoke(const QString &c) | |||
542 | if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) { | 542 | if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) { |
543 | // If the channel is already register, the app is already running, so show it. | 543 | // If the channel is already register, the app is already running, so show it. |
544 | { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } | 544 | { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } |
545 | 545 | ||
546 | //QCopEnvelope e("QPE/System", "notBusy(QString)" ); | 546 | //QCopEnvelope e("QPE/System", "notBusy(QString)" ); |
547 | //e << ap; | 547 | //e << ap; |
548 | return; | 548 | return; |
549 | } | 549 | } |
550 | // XXX should unlock file /tmp/qcop-msg-ap | 550 | // XXX should unlock file /tmp/qcop-msg-ap |
551 | //see if it is being started | 551 | //see if it is being started |
552 | if ( StartingAppList::isStarting( ap ) ) { | 552 | if ( StartingAppList::isStarting( ap ) ) { |
553 | // FIXME take it out for now, since it leads to a much to short showing of wait if | 553 | // FIXME take it out for now, since it leads to a much to short showing of wait if |
554 | // some entry is clicked. | 554 | // some entry is clicked. |
555 | // Real cause is that ::execute is called twice for document tab. But it would need some larger changes | 555 | // Real cause is that ::execute is called twice for document tab. But it would need some larger changes |
556 | // to fix that, and with future syncs with qtopia 1.6 it will change anyway big time since somebody there | 556 | // to fix that, and with future syncs with qtopia 1.6 it will change anyway big time since somebody there |
557 | // had the idea that an apploader belongs to the launcher ... | 557 | // had the idea that an apploader belongs to the launcher ... |
558 | //QCopEnvelope e("QPE/System", "notBusy(QString)" ); | 558 | //QCopEnvelope e("QPE/System", "notBusy(QString)" ); |
559 | //e << ap; | 559 | //e << ap; |
560 | return; | 560 | return; |
561 | } | 561 | } |
562 | 562 | ||
563 | #endif | 563 | #endif |
564 | 564 | ||
565 | #ifdef QT_NO_QWS_MULTIPROCESS | 565 | #ifdef QT_NO_QWS_MULTIPROCESS |
566 | QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 ); | 566 | QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 ); |
567 | #else | 567 | #else |
568 | 568 | ||
569 | QStrList slist; | 569 | QStrList slist; |
570 | unsigned int j; | 570 | unsigned int j; |
571 | for ( j = 0; j < list.count(); j++ ) | 571 | for ( j = 0; j < list.count(); j++ ) |
572 | slist.append( list[j].utf8() ); | 572 | slist.append( list[j].utf8() ); |
573 | 573 | ||
574 | const char **args = new (const char *)[slist.count() + 1]; | 574 | const char **args = new const char *[slist.count() + 1]; |
575 | for ( j = 0; j < slist.count(); j++ ) | 575 | for ( j = 0; j < slist.count(); j++ ) |
576 | args[j] = slist.at(j); | 576 | args[j] = slist.at(j); |
577 | args[j] = NULL; | 577 | args[j] = NULL; |
578 | 578 | ||
579 | #if !defined(QT_NO_COP) | 579 | #if !defined(QT_NO_COP) |
580 | // an attempt to show a wait... | 580 | // an attempt to show a wait... |
581 | // more logic should be used, but this will be fine for the moment... | 581 | // more logic should be used, but this will be fine for the moment... |
582 | QCopEnvelope ( "QPE/System", "busy()" ); | 582 | QCopEnvelope ( "QPE/System", "busy()" ); |
583 | #endif | 583 | #endif |
584 | 584 | ||
585 | #ifdef HAVE_QUICKEXEC | 585 | #ifdef HAVE_QUICKEXEC |
586 | #ifdef Q_OS_MACX | 586 | #ifdef Q_OS_MACX |
587 | QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".dylib"; | 587 | QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".dylib"; |
588 | #else | 588 | #else |
589 | QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so"; | 589 | QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so"; |
590 | #endif | 590 | #endif |
591 | qDebug("libfile = %s", libexe.latin1() ); | 591 | qDebug("libfile = %s", libexe.latin1() ); |
592 | if ( QFile::exists( libexe ) ) { | 592 | if ( QFile::exists( libexe ) ) { |
593 | qDebug("calling quickexec %s", libexe.latin1() ); | 593 | qDebug("calling quickexec %s", libexe.latin1() ); |
594 | quickexecv( libexe.utf8().data(), (const char **)args ); | 594 | quickexecv( libexe.utf8().data(), (const char **)args ); |
595 | } else | 595 | } else |
596 | #endif | 596 | #endif |
597 | { | 597 | { |
598 | bool success = false; | 598 | bool success = false; |
599 | int pfd [2]; | 599 | int pfd [2]; |
600 | if ( ::pipe ( pfd ) < 0 ) | 600 | if ( ::pipe ( pfd ) < 0 ) |
601 | pfd [0] = pfd [1] = -1; | 601 | pfd [0] = pfd [1] = -1; |
602 | 602 | ||
603 | pid_t pid = ::fork ( ); | 603 | pid_t pid = ::fork ( ); |
604 | 604 | ||
605 | if ( pid == 0 ) { // child | 605 | if ( pid == 0 ) { // child |
606 | for ( int fd = 3; fd < 100; fd++ ) { | 606 | for ( int fd = 3; fd < 100; fd++ ) { |