5 files changed, 5 insertions, 6 deletions

diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control
index 9e0957b..6e9ad7c 100644
--- a/core/multimedia/opieplayer/modplug/opie-modplugin.control
+++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control
@@ -1,10 +1,10 @@
 Package: opie-modplugin
 Files: plugins/codecs/libmodplugin.so*
 Priority: optional
 Section: libs
 Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION$EXTRAVERSION
+Version: 2.0.2-$EXTRAVERSION
 Depends: task-opie-minimal
 Description: MOD/XM/S3M/IT plugin using libmodplug
  Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment.
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 0654e1a..3f0ac74 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -1,166 +1,166 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of the Open Palmtop Environment (see www.opie.info).
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 // #include "addresssettings.h"
 #include "addressbook.h"
 
 #include <opie2/odebug.h>
 #include <opie2/ofileselector.h>
 #include <opie2/ofiledialog.h>
 #include <opie2/opimcontact.h>
 #include <opie2/ocontactaccessbackend_vcard.h>
 
 #include <qpe/resource.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
 #include <qmenubar.h>
 // #include <qtoolbar.h>
 // #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
 
 #include <qaction.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 
 #include "picker.h"
 #include "configdlg.h"
 
 extern QString addressbookPersonalVCardName();
 
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
                                       WFlags f )
         : QMainWindow( parent, name, f ),
           catMenu (0l),
           abEditor(0l),
           syncing(FALSE),
           m_tableViewButton(0l),
           m_cardViewButton(0l)
 {
         isLoading = true;
 
         m_config.load();
 
         setCaption( tr("Contacts") );
-        setIcon( Resource::loadPixmap( "AddressBook" ) );
+        setIcon( Resource::loadPixmap( "addressbook/AddressBook" ) );
 
         // Settings for Main Menu
         // setToolBarsMovable( false );
         setToolBarsMovable( !m_config.fixedBars() );
         setRightJustification( true );
 
         QToolBar *bar = new QToolBar( this );
         bar->setHorizontalStretchable( TRUE );
 
         QMenuBar *mbList = new QMenuBar( bar  );
         mbList->setMargin( 0 );
 
         QPopupMenu *edit = new QPopupMenu( mbList );
         mbList->insertItem( tr( "Contact" ), edit );
 
         // Category Menu
         catMenu = new QPopupMenu( this );
         catMenu->setCheckable( TRUE );
         connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
         mbList->insertItem( tr("View"), catMenu );
 
         // Create Toolbar
         listTools = new QToolBar( this, "list operations" );
         listTools->setHorizontalStretchable( true );
         addToolBar( listTools );
         moveToolBar( listTools, m_config.getToolBarPos() );
 
         // View Icons
         m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/listview" ),
                                           QString::null, 0, this, 0 );
         connect( m_tableViewButton, SIGNAL( activated() ), this, SLOT( slotListView() ) );
         m_tableViewButton->setToggleAction( true );
         m_tableViewButton->addTo( listTools );
         m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "addressbook/cardview" ),  QString::null, 0, this, 0 );
         connect( m_cardViewButton, SIGNAL( activated() ), this, SLOT( slotCardView() ) );
         m_cardViewButton->setToggleAction( true );
         m_cardViewButton->addTo( listTools );
 
         listTools->addSeparator();
 
         // Other Buttons
         QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null,
                                   0, this, 0 );
         actionNew = a;
         connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) );
         a->addTo( edit );
         a->addTo( listTools );
 
         a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
                          0, this, 0 );
         actionEdit = a;
         connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) );
         a->addTo( edit );
         a->addTo( listTools );
 
         a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
                          0, this, 0 );
         actionTrash = a;
         connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) );
         a->addTo( edit );
         a->addTo( listTools );
 
 
         // make it possible to go directly to businesscard via qcop call
         //#if defined(Q_WS_QWS) // Why this ? (se)
 #if !defined(QT_NO_COP)
         QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
         connect (addressChannel, SIGNAL( received(const QCString&,const QByteArray&)),
                  this, SLOT ( appMessage(const QCString&,const QByteArray&) ) );
 #endif
         // #endif
         a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
                          QString::null, 0, this, 0 );
         actionFind = a;
         connect( a, SIGNAL(activated()), this, SLOT( slotFindOpen()) );
         a->addTo( edit );
         a->addTo( listTools );
 
         // Much better search widget, taken from QTReader.. (se)
         searchBar = new OFloatBar( "Search", this, QMainWindow::Top, TRUE );
         searchBar->setHorizontalStretchable( TRUE );
         searchBar->hide();
         searchEdit = new QLineEdit( searchBar, "searchEdit" );
 
         // QFont f("unifont", 16 /*, QFont::Bold*/);
         // searchEdit->setFont( f );
 
         searchBar->setStretchableWidget( searchEdit );
         connect( searchEdit, SIGNAL( returnPressed() ),
                  this, SLOT( slotFind() ) );
 
         a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
         a->addTo( searchBar );
 
         a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index 6798141..3d637cc 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -1,12 +1,12 @@
 Package: task-opie-today
 Priority: optional
 Section: opie/pim
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION$EXTRAVERSION
+Version: 0.5$EXTRAVERSION
 Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin
 License: GPL
 Description: Task for basic Today app setup
  Includes datebook and todolist plugins.
 
 Files:
diff --git a/core/settings/security/demo/multiauth.control b/core/settings/security/demo/multiauth.control
index c7dd82a..c549035 100644
--- a/core/settings/security/demo/multiauth.control
+++ b/core/settings/security/demo/multiauth.control
@@ -1,16 +1,16 @@
 Package: opie-multiauth
 Files: bin/multiauth apps/Applications/multiauth.desktop pics/security/multiauth.png
 Priority: optional
 Section: opie/settings
 Maintainer: Clement Seveillac <clement@nist.gov>
 Architecture: arm
-Version: $QPE_VERSION$EXTRAVERSION
+Version: 0.0.2$EXTRAVERSION
 Depends: opie-security
 Description: multi-plugin authentication demonstrator for Opie.
  This demonstration application allows us to use one or several
  ways to lock and unlock our device. Since it really locks your
  PDA the way you configured it in the Security settings, you can
  map a button to it through the Buttons settings to lock your
  PDA on demand, with one simple click.
  You must install some opie-multiauth-* plugins, and configure
  them through opie-security, to really see its possibilities.
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index fbed5a1..59dd17e 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -24,194 +24,193 @@
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/oapplication.h>
 
 /* QT */
 #include <qpainter.h>
 #include <qstrlist.h>
 #include <qtimer.h>
 #include <qguardedptr.h>
 #include <qcopchannel_qws.h>
 
 #ifdef private
 #       undef  private
 #endif
 #define private public
 #include <qtopia/qpeapplication.h>
 #undef private
 
 /* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #ifdef _OS_LINUX_
 #include <sys/prctl.h>
 #ifndef PR_SET_NAME
 #define PR_SET_NAME 15
 #endif
 #endif
 
 #include <unistd.h>
 
 
 using QuickPrivate::PluginLoader;
 
 static QPEApplication *app = 0;
 static PluginLoader *loader = 0;
 static ApplicationInterface *appIface = 0;
 static QGuardedPtr<QWidget> mainWindow;
 
 #ifdef _OS_LINUX_
 static char **argv0 = 0;
 static int argv_lth;
 extern char **environ;
 #ifndef SPT_BUFSIZE
 #define SPT_BUFSIZE     2048
 #endif
 #include <stdarg.h>
 void setproctitle (const char *fmt,...) {
     int        i;
     char       buf[SPT_BUFSIZE];
     va_list    ap;
 
     if (!argv0)
         return;
 
     va_start(ap, fmt);
     (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap);
     va_end(ap);
 
     i = strlen (buf);
     if (i > argv_lth - 2) {
         i = argv_lth - 2;
         buf[i] = '\0';
     }
 
     memset(argv0[0], '\0', argv_lth);       /* clear the memory area */
     (void) strcpy (argv0[0], buf);
 
     argv0[1] = NULL;
 }
 #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 ) {
-            owarn << "Plugin does not support QuickLauncher interface" << oendl;
+        if ( ! ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) ) {
             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 );
             delete this;
         } else if ( msg == "execute(QString)" ) {
             delete qlChannel;
             QDataStream stream( data, IO_ReadOnly );
             QString arg;
             stream >> arg;
             odebug << "QuickLauncher execute: " << arg << oendl;
             QStrList argList;
             argList.append( arg.utf8() );
             doQuickLaunch( argList );
             delete this;
         }
     }
 
 private:
     void doQuickLaunch( QStrList &argList )
     {
         static int myargc = argList.count();
         static char **myargv = new char *[myargc + 1];
 
         for ( int j = 0; j < myargc; j++ ) {
             myargv[j] = new char [strlen(argList.at(j))+1];
             strcpy( myargv[j], argList.at(j) );
         }
 
         myargv[myargc] = NULL;
 #ifdef _OS_LINUX_
         // Change name of process
         setproctitle(myargv[0]);
         prctl( PR_SET_NAME, (unsigned long)myargv[0], 0, 0, 0 );
 #endif
 
         connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
         app->exit_loop();
         app->initApp( myargc, myargv );
         exec( myargc, myargv );
     }
 
 private:
     QCopChannel *qlChannel;
 };
 
 int main( int argc, char** argv )
 {
     app = new Opie::Core::OApplication( argc, argv );
 
     loader = new PluginLoader( "application" );
 
     unsetenv( "LD_BIND_NOW" );
 
     QCString arg0 = argv[0];
     int sep = arg0.findRev( '/' );
 
     if ( sep > 0 )
         arg0 = arg0.mid( sep+1 );
 
     if ( arg0 != "quicklauncher" ) {
         odebug << "QuickLauncher invoked as: " << arg0.data() << oendl;
         QuickLauncher::exec( argc, argv );
     } else {
 #ifdef _OS_LINUX_
         // Setup to change proc title
         int i;
         char **envp = environ;
         /* Move the environment so we can reuse the memory.
          * (Code borrowed from sendmail.) */
         for (i = 0; envp[i] != NULL; i++)