1) removed connection to inexistent slot
2) fix code to save Kate's session from TDE's session manager. This
relates to bug 2691.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/141/head
Michele Calgaro 4 years ago
parent 2d8b5af506
commit 232282cbf9
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -83,8 +83,6 @@ KateApp::KateApp (TDECmdLineArgs *args)
kdDebug()<<"Setting KATE_PID: '"<<getpid()<<"'"<<endl; kdDebug()<<"Setting KATE_PID: '"<<getpid()<<"'"<<endl;
::setenv( "KATE_PID", TQString(TQString("%1").arg(getpid())).latin1(), 1 ); ::setenv( "KATE_PID", TQString(TQString("%1").arg(getpid())).latin1(), 1 );
connect(this, TQT_SIGNAL(aboutToQuit()), this, TQT_SLOT(slotAboutToQuit()));
// handle restore different // handle restore different
if (isRestored()) if (isRestored())
{ {
@ -299,7 +297,7 @@ bool KateApp::startupKate()
void KateApp::shutdownKate(KateMainWindow *win) void KateApp::shutdownKate(KateMainWindow *win)
{ {
if (!win->queryClose_internal() || !query_session_close()) if (!win->queryClose_internal())
return; return;
// detach the dcopClient // detach the dcopClient

@ -345,23 +345,31 @@ bool KateMainWindow::queryClose_internal() {
uint documentCount=KateDocManager::self()->documents(); uint documentCount=KateDocManager::self()->documents();
if ( !showModOnDiskPrompt() ) if ( !showModOnDiskPrompt() )
{
return false; return false;
}
TQPtrList<Kate::Document> modifiedDocuments=KateDocManager::self()->modifiedDocumentList(); TQPtrList<Kate::Document> modifiedDocuments=KateDocManager::self()->modifiedDocumentList();
bool shutdown=(modifiedDocuments.count()==0); bool shutdown = (modifiedDocuments.count() == 0);
if (!shutdown) { if (!shutdown)
shutdown=KateSaveModifiedDialog::queryClose(this,modifiedDocuments); {
shutdown = KateSaveModifiedDialog::queryClose(this,modifiedDocuments);
} }
if ( KateDocManager::self()->documents() > documentCount ) { if ( KateDocManager::self()->documents() > documentCount ) {
KMessageBox::information (this, KMessageBox::information (this,
i18n ("New file opened while trying to close Kate, closing aborted."), i18n ("New file opened while trying to close Kate, closing aborted."),
i18n ("Closing Aborted")); i18n ("Closing Aborted"));
shutdown=false; return false;
} }
return shutdown; if (!shutdown)
{
return false;
}
return KateApp::self()->query_session_close();
} }
/** /**
@ -385,7 +393,7 @@ bool KateMainWindow::queryClose()
// last one: check if we can close all documents and sessions, try run // last one: check if we can close all documents and sessions, try run
// and save docs if we really close down ! // and save docs if we really close down !
if (queryClose_internal() && KateApp::self()->query_session_close()) if (queryClose_internal())
{ {
// detach the dcopClient // detach the dcopClient
KateApp::self()->dcopClient()->detach(); KateApp::self()->dcopClient()->detach();

Loading…
Cancel
Save