diff options
| author |  Fabio Bas | 2009-05-09 20:01:38 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-05-09 20:01:38 +0000 |
| commit | 071f461bbc65b8d5d06b62cd7a93203359738d8c (patch) | |
| tree | 91fca92dad9d0987434fc4248012c6379fc08897 /src | |
| parent | fix for #310 (diff) | |
| download | KVIrc-071f461bbc65b8d5d06b62cd7a93203359738d8c.tar.gz KVIrc-071f461bbc65b8d5d06b62cd7a93203359738d8c.tar.bz2 KVIrc-071f461bbc65b8d5d06b62cd7a93203359738d8c.zip | |
a small cleanage
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3209 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/kvi_frame.cpp | 7 | ||||
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.cpp | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 93a32e99c..1eb05e0b0 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -856,9 +856,7 @@ void KviFrame::closeEvent(QCloseEvent *e) } if(dockExtension()) { - - dockExtension()->setPrevWindowState(windowState()); - QTimer::singleShot( 0, this, SLOT(hide()) ); + hide(); } return; } @@ -1207,8 +1205,7 @@ void KviFrame::hideEvent ( QHideEvent * e) if(dockExtension()) { - dockExtension()->setPrevWindowState(windowState()); - QTimer::singleShot( 0, this, SLOT(hide()) ); + hide(); } } diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 56b768331..12454b1df 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -245,11 +245,13 @@ void KviTrayIcon::doAway(bool) KviConsole* pConsole=(KviConsole*)wnd; if(pConsole->isConnected()) if(id==-2) + { pConsole->connection()->sendFmtData("AWAY"); - else + } else { pConsole->connection()->sendFmtData("AWAY :%s", pConsole->connection()->encodeText(KVI_OPTION_STRING(KviOption_stringAwayMessage)).data() ); + } } ++it; } @@ -258,11 +260,13 @@ void KviTrayIcon::doAway(bool) if(pConsole) if(pConsole->isConnected()) if(pConsole->connection()->userInfo()->isAway()) + { pConsole->connection()->sendFmtData("AWAY"); - else + } else { pConsole->connection()->sendFmtData("AWAY :%s", pConsole->connection()->encodeText(KVI_OPTION_STRING(KviOption_stringAwayMessage)).data() ); + } } } @@ -333,6 +337,7 @@ void KviTrayIcon::toggleParentFrame() } else { top_widget->show(); top_widget->raise(); + if(g_pActiveWindow) g_pActiveWindow->setFocus(); if(m_pFrm->isMinimized()) m_pFrm->showNormal(); |