Import 0.4.3 version in mainstream branch

[keepassx] / src / mainwindow.h

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 26607fa..a9b8d67 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -78,9 +78,7 @@ class KeepassMainWindow : public QMainWindow, private Ui_MainWindow{
                //void OnItemCollaped(QTreeWidgetItem*);
                void OnShowSearchResults();
                void OnEntryChanged(SelectionState);
-#ifndef Q_WS_HILDON
                void OnSysTrayActivated(QSystemTrayIcon::ActivationReason);
-#endif
                void restoreWindow();
                void OnImport(QAction*);
                void OnExport(QAction*);
@@ -138,6 +136,7 @@ class KeepassMainWindow : public QMainWindow, private Ui_MainWindow{
                QWidget* NormalCentralWidget;
                QWidget* LockedCentralWidget;
                Ui_WorkspaceLockedWidget WorkspaceLockedWidget;
+               bool ShutingDown;
                bool InUnLock;
                QList<int> lockGroup;
                QDialog* unlockDlg;