Commit b794f9d6 authored by Scott Wheeler's avatar Scott Wheeler

Don't show the standard message for closing the window when we've tried to

quit from the system tray.

svn path=/trunk/kdemultimedia/juk/; revision=390706
parent 6c805f37
......@@ -218,7 +218,7 @@ void JuK::setupSystemTray()
m_toggleDockOnCloseAction->setEnabled(true);
m_togglePopupsAction->setEnabled(true);
connect(m_systemTray, SIGNAL(quitSelected()), this, SLOT(slotQuit()));
connect(m_systemTray, SIGNAL(quitSelected()), this, SLOT(slotAboutToQuit()));
}
else {
m_systemTray = 0;
......@@ -413,8 +413,14 @@ void JuK::slotShowHide()
setShown(!isShown());
}
void JuK::slotAboutToQuit()
{
m_shuttingDown = true;
}
void JuK::slotQuit()
{
kdDebug(65432) << k_funcinfo << endl;
m_shuttingDown = true;
kapp->quit();
}
......
......@@ -66,6 +66,7 @@ private:
private slots:
void slotShowHide();
void slotAboutToQuit();
void slotQuit();
void slotToggleSystemTray(bool enabled);
void slotEditKeys();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment