diff options
| author | kali <kali@leap.se> | 2012-09-20 05:00:32 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 05:00:32 +0900 |
| commit | 1ab8247ecb8664af5159b7f1e050189f5e637146 (patch) | |
| tree | 1fac7766356a2a69870fd0e00fd306131bd036a9 /src/leap/gui/test_mainwindow_rc.py | |
| parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) | |
| parent | 3c7451d62363d0a3326552956db630dda09392fa (diff) | |
Merge branch 'feature/systray-menu' into develop
Close #536.
Cleaning up of the systray menu.
Main window starts hidden if not in debug mode.
Incidentally, some fixes related to the subprocess invocation and termination, removing many of the annoying hangs during debug.
Diffstat (limited to 'src/leap/gui/test_mainwindow_rc.py')
| -rw-r--r-- | src/leap/gui/test_mainwindow_rc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/gui/test_mainwindow_rc.py b/src/leap/gui/test_mainwindow_rc.py index fd02704e..88ae5854 100644 --- a/src/leap/gui/test_mainwindow_rc.py +++ b/src/leap/gui/test_mainwindow_rc.py @@ -8,7 +8,7 @@ from leap.gui import mainwindow_rc # I have to admit that there's something # perverse in testing this. -# But I thought that it could be a good idea +# Even though, I still think that it _is_ a good idea # to put a check to avoid non-updated resources files. # so, if you came here because an updated resource @@ -23,4 +23,4 @@ class MainWindowResourcesTest(unittest.TestCase): def test_mainwindow_resources_hash(self): self.assertEqual( hashlib.md5(mainwindow_rc.qt_resource_data).hexdigest(), - '5cc26322f96fabaa05c404f22774c716') + 'd74eb99247b9d5cd2f00b2f695ca6b59') |