diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-06-23 02:32:10 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-06-23 02:32:10 +0000 |
| commit | 672beaaffcce643b8ab17a191327caa771641a7e (patch) | |
| tree | 4b4850b93992ba065767768c7f5ff2de2e3e6421 /kontact/src | |
| parent | 23f5d4229caea32af49c007de85563158630b5d4 (diff) | |
| download | tdepim-672beaaffcce643b8ab17a191327caa771641a7e.tar.gz tdepim-672beaaffcce643b8ab17a191327caa771641a7e.zip | |
Major KAddressbook carddav fixes and improvements (should now work with Zimbra once Zimbra fixes a standards compliance issue with contact creation mimetypes)
Fixed handling of close events and save interaction with Kontact and Korganizer
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1141613 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kontact/src')
| -rw-r--r-- | kontact/src/main.cpp | 2 | ||||
| -rw-r--r-- | kontact/src/mainwindow.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index d3fce17c..ee29ce9d 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -123,7 +123,7 @@ int KontactApp::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" ); + KAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" ); about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" ); about.addAuthor( "Don Sanders", 0, "sanders@kde.org" ); about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index de4eb2df..a9608528 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -1026,7 +1026,8 @@ void MainWindow::saveProperties( KConfig *config ) bool MainWindow::queryClose() { - if ( kapp->sessionSaving() || mReallyClose ) + //if ( kapp->sessionSaving() || mReallyClose ) + if ( kapp->sessionSaving() ) return true; bool localClose = true; |