diff options
| author | kali <kali@leap.se> | 2012-09-06 02:34:40 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-06 02:34:40 +0900 |
| commit | bd26d30f34104898dd6c5314dee688e27c82529b (patch) | |
| tree | 226ed4f238369f8937c28e3d0f11258cbfb7b506 /src/leap/baseapp/systray.py | |
| parent | 6ef92e257ce1e605194cb26ff6cb804c7d2c3418 (diff) | |
| parent | 8148bc9c8c113c41fcb18b397669b1f13447c653 (diff) | |
Merge branch 'feature/error-handling' into develop
Closes #504: design generic error handling solution.
* app-wide logging config.
* --logfile command line argument.
* created basic exception hierarchy
* conductor pushes exceptions to error queue
* in Qt, error dialogs are created from exception attributes
Diffstat (limited to 'src/leap/baseapp/systray.py')
| -rw-r--r-- | src/leap/baseapp/systray.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py index f3832473..c696ee74 100644 --- a/src/leap/baseapp/systray.py +++ b/src/leap/baseapp/systray.py @@ -4,7 +4,7 @@ from PyQt4 import QtGui from leap.gui import mainwindow_rc -class StatusAwareTrayIcon(object): +class StatusAwareTrayIconMixin(object): """ a mix of several functions needed to create a systray and make it |