[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Konversation] 84fb0a5: Properly terminate on KDE shutdown/logout.
From:       Christian Muehlhaeuser <chris () chris ! de>
Date:       2010-07-01 13:27:26
Message-ID: 20100701132726.885F6BB55F0 () projects ! kde ! org
[Download RAW message or body]

commit 84fb0a55f0a8ad4974af2fd8d951f8bd282fc1f0
Author: Christian Muehlhaeuser <chris@chris.de>
Date:   Sat Jun 5 17:11:48 2004 +0000

    Properly terminate on KDE shutdown/logout.
    
    svn path=/trunk/kdeextragear-2/konversation/; revision=317970

diff --git a/ChangeLog b/ChangeLog
index 1e599c9..77e3618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 Changes from 0.13 to 0.14
+- Properly receive a logout/shutdown request and terminate konversation,
+  instead of minimizing to the systray.
 - Make OSD switchable on/off via DCOP. Thanks to Michael Goettsche! (BR 75870)
 - Dates can now be shown, next to the timestamp. Patch by Michael Goettsche
   (BR 82785) (thanks!)
diff --git a/konversation/konversationmainwindow.cpp b/konversation/konversationmainwindow.cpp
index 95b0d62..20b88d3 100644
--- a/konversation/konversationmainwindow.cpp
+++ b/konversation/konversationmainwindow.cpp
@@ -836,6 +836,9 @@ void KonversationMainWindow::setShowTabBarCloseButton(bool) {}
 
 void KonversationMainWindow::closeEvent(QCloseEvent* e)
 {
+  KonversationApplication* konv_app=static_cast<KonversationApplication*>(KApplication::kApplication());
+  if ( konv_app->sessionSaving() ) m_closeApp = true;
+  
   if(KonversationApplication::preferences.getShowTrayIcon() && !m_closeApp) {
     // Message copied from kopete...
     KMessageBox::information(this,
[prev in list] [next in list] [prev in thread] [next in thread]