Added error message to make difference between plug loading error

or plugin initialization error

1 files changed, 5 insertions, 2 deletions

diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index 5f0d80b..fbed5a1 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -96,52 +96,55 @@ void setproctitle (const char *fmt,...) {
 #endif
 
 
 class QuickLauncher : public QObject
 {
     Q_OBJECT
 public:
     QuickLauncher() : QObject()
     {
         QCString ch("QPE/QuickLauncher-");
         ch += QString::number(getpid());
         qlChannel = new QCopChannel( ch, this);
         connect( qlChannel, SIGNAL(received(const QCString&,const QByteArray&)),
                  this, SLOT(message(const QCString&,const QByteArray&)) );
     }
 
     static void exec( int /*argc*/, char **argv )
     {
         QString appName = argv[0];
         int sep = appName.findRev( '/' );
         if ( sep > 0 )
             appName = appName.mid( sep+1 );
 
         appIface = 0;
-        if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) {
-            mainWindow = appIface->createMainWindow( appName );
+        if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) != QS_OK ) {
+            owarn << "Plugin does not support QuickLauncher interface" << oendl;
+            exit(-1);
         }
 
+        mainWindow = appIface->createMainWindow( appName );
+
         if ( mainWindow ) {
             if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) {
                 app->showMainDocumentWidget( mainWindow );
             } else {
                 app->showMainWidget( mainWindow );
             }
         } else {
             owarn << "Could not create application main window" << oendl;
             exit(-1);
         }
     }
 
 private slots:
     void message(const QCString &msg, const QByteArray & data)
     {
         QStrList argList;
 
         if ( msg == "execute(QStrList)" ) {
             delete qlChannel;
             QDataStream stream( data, IO_ReadOnly );
             QStrList argList;
             stream >> argList;
             odebug << "QuickLauncher execute: " << argList.at(0) << oendl;
             doQuickLaunch( argList );