diff --git a/kmail/kmversion.h b/kmail/kmversion.h index 782dd4df4e..9e7f6b5722 100644 --- a/kmail/kmversion.h +++ b/kmail/kmversion.h @@ -1,8 +1,8 @@ // KMail Version Information // #ifndef kmversion_h #define kmversion_h -#define KMAIL_VERSION "1.9.10 (enterprise35 0.20090907.1020969)" +#define KMAIL_VERSION "1.9.10 (enterprise35 0.20090911.1022317)" #endif /*kmversion_h*/ diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 7bc2632875..9c95d7e376 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -1,193 +1,193 @@ /* This file is part of KDE Kontact. Copyright (c) 2001 Matthias Hoelzer-Kluepfel Copyright (c) 2002-2003 Daniel Molkentin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include #include #include #include #include #include #include #include #include #include #include #include "plugin.h" #include #include "prefs.h" #include "alarmclient.h" #include "mainwindow.h" #include // in ../interfaces #include "profilemanager.h" using namespace std; static const char description[] = I18N_NOOP( "KDE personal information manager" ); -static const char version[] = "1.2.9 (enterprise35 0.20090907.1020969)"; +static const char version[] = "1.2.9 (enterprise35 0.20090911.1022317)"; class KontactApp : public KUniqueApplication { public: KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) {} ~KontactApp() {} int newInstance(); void setMainWindow( Kontact::MainWindow *window ) { mMainWindow = window; setMainWidget( window ); } void setSessionRestored( bool restored ) { mSessionRestored = restored; } private: void startKOrgac(); Kontact::MainWindow *mMainWindow; bool mSessionRestored; }; static void listPlugins() { KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( QString::fromLatin1( "Kontact/Plugin" ), QString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); // skip summary only plugins QVariant var = service->property( "X-KDE-KontactPluginHasPart" ); if ( var.isValid() && var.toBool() == false ) continue; cout << service->library().remove( "libkontact_" ).latin1() << endl; } } static void listProfiles() { KInstance *instance = new KInstance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options QValueList profiles = Kontact::ProfileManager::self()->profiles(); for( QValueListIterator it = profiles.begin() ; it != profiles.end(); ++it ) { cout << (*it).name().latin1() << endl; } } int KontactApp::newInstance() { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); QString moduleName; if ( Kontact::Prefs::self()->forceStartupPlugin() ) { moduleName = Kontact::Prefs::self()->forcedStartupPlugin(); } if ( args->isSet( "module" ) ) { moduleName = QString::fromLocal8Bit( args->getOption( "module" ) ); } if ( !mSessionRestored ) { if ( !mMainWindow ) { mMainWindow = new Kontact::MainWindow(); if ( !moduleName.isEmpty() ) mMainWindow->setActivePluginModule( moduleName ); mMainWindow->show(); setMainWidget( mMainWindow ); // --iconify is needed in kontact, although kstart can do that too, // because kstart returns immediately so it's too early to talk DCOP to the app. if ( args->isSet( "iconify" ) ) KWin::iconifyWindow( mMainWindow->winId(), false /*no animation*/ ); } else { if ( !moduleName.isEmpty() ) mMainWindow->setActivePluginModule( moduleName ); } } if ( args->isSet( "profile" ) ) { QValueList profiles = Kontact::ProfileManager::self()->profiles(); for( QValueListIterator it = profiles.begin(); it != profiles.end(); ++it ){ if( args->getOption("profile") == (*it).name().latin1() ) { Kontact::ProfileManager::self()->loadProfile( (*it).id() ); break; } } } AlarmClient alarmclient; alarmclient.startDaemon(); // Handle startup notification and window activation // (The first time it will do nothing except note that it was called) return KUniqueApplication::newInstance(); } int main( int argc, char **argv ) { KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description, KAboutData::License_GPL, I18N_NOOP("(C) 2001-2008 The Kontact developers"), 0, "http://kontact.org" ); about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" ); about.addAuthor( "Don Sanders", 0, "sanders@kde.org" ); about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); about.addAuthor( "Tobias K\303\266nig", 0, "tokoe@kde.org" ); about.addAuthor( "David Faure", 0, "faure@kde.org" ); about.addAuthor( "Ingo Kl\303\266cker", 0, "kloecker@kde.org" ); about.addAuthor( "Sven L\303\274ppken", 0, "sven@kde.org" ); about.addAuthor( "Zack Rusin", 0, "zack@kde.org" ); about.addAuthor( "Matthias Hoelzer-Kluepfel", I18N_NOOP("Original Author"), "mhk@kde.org" ); KCmdLineArgs::init( argc, argv, &about ); Kontact::UniqueAppHandler::loadKontactCommandLineOptions(); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if ( args->isSet( "list" ) ) { listPlugins(); return 0; } if ( args->isSet( "listprofiles" ) ) { listProfiles(); return 0; } if ( !KontactApp::start() ) { // Already running, brought to the foreground. return 0; } KontactApp app; if ( app.restoringSession() ) { // There can only be one main window if ( KMainWindow::canBeRestored( 1 ) ) { Kontact::MainWindow *mainWindow = new Kontact::MainWindow(); app.setMainWindow( mainWindow ); app.setSessionRestored( true ); mainWindow->show(); mainWindow->restore( 1 ); } } bool ret = app.exec(); while ( KMainWindow::memberList->first() ) delete KMainWindow::memberList->first(); return ret; } diff --git a/korganizer/version.h b/korganizer/version.h index 656c467baf..cb1e50d563 100644 --- a/korganizer/version.h +++ b/korganizer/version.h @@ -1,58 +1,58 @@ /* This file is part of KOrganizer. Copyright (c) 1998-1999 Preston Brown Copyright (c) 2000-2004 Cornelius Schumacher This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #ifndef KORG_VERSION_H #define KORG_VERSION_H /* Version scheme: "x.y.z build". x is the version number. y is the major release number. z is the minor release number. "x.y.z" follow the kdelibs version KOrganizer is released with. If "z" is 0, it the version is "x.y" "build" is empty for final versions. For development versions "build" is something like "pre", "alpha1", "alpha2", "beta1", "beta2", "rc1", "rc2". Examples in chronological order: 3.0 3.0.1 3.1 alpha1 3.1 beta1 3.1 beta2 3.1 rc1 3.1 3.1.1 3.2 pre 3.2 alpha1 */ -static const char korgVersion[] = "3.5.9 (enterprise35 0.20090907.1020969)"; +static const char korgVersion[] = "3.5.9 (enterprise35 0.20090911.1022317)"; #endif