summaryrefslogtreecommitdiff
path: root/core
authorwimpie <wimpie>2005-01-09 03:02:21 (UTC)
committer wimpie <wimpie>2005-01-09 03:02:21 (UTC)
commit67d1d0b292553af550219d770cbd5c00987d8b8b (patch) (side-by-side diff)
tree517759c7fbda44a40ff733e3b5d5667d90558caa /core
parent987bc9a2c5b39ddd4dc2a665cea65688bfd2179e (diff)
downloadopie-67d1d0b292553af550219d770cbd5c00987d8b8b.zip
opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.gz
opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.bz2
CONTROL files : reset version to 'standard' format
(partly rolls back my drastic all-applicatoins-same-version change) now format is x.y(.z)$EXTRAVERSION where x.y (and aptionally .z) are x : major version y : minor version z : application patch and extra version is seconds-since-epoch this value can be used to automatically upgrade versions with minor changes (without manual update of the control file)
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/modplug/opie-modplugin.control2
-rw-r--r--core/pim/addressbook/addressbook.cpp2
-rw-r--r--core/pim/today/task-opie-today.control2
-rw-r--r--core/settings/security/demo/multiauth.control2
-rw-r--r--core/tools/quicklauncher/main.cpp3
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
@@ -64,13 +64,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
{
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 );
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,13 +1,13 @@
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
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
@@ -114,14 +114,13 @@ public:
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 ) {