diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-08 12:08:09 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-08 12:08:09 -0300 |
| commit | 1240049bc5a1974ac9ef3b6ec2c07746938136ef (patch) | |
| tree | 950cc540055c927161e60761319b6b996f320a64 | |
| parent | 7f2eb30f8c8a81dd877cea61e965f4331441d9ec (diff) | |
| parent | 393cb1f2a471e3a896d170a26aeac0c8ba161972 (diff) | |
Merge remote-tracking branch 'chiiph/bug/display_mail_status_enabled' into develop
| -rw-r--r-- | changes/bug_display_mail_status_enabled | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug_display_mail_status_enabled b/changes/bug_display_mail_status_enabled new file mode 100644 index 00000000..44a94d5f --- /dev/null +++ b/changes/bug_display_mail_status_enabled @@ -0,0 +1,2 @@ + o Display mail status in the tray icon as an enabled item. Fixes + #4036.
\ No newline at end of file diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 84f09fd9..db6a19d2 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -268,7 +268,6 @@ class MainWindow(QtGui.QMainWindow): self._systray = None self._action_mail_status = QtGui.QAction(self.tr("Mail is OFF"), self) - self._action_mail_status.setEnabled(False) self._mail_status.set_action_mail_status(self._action_mail_status) self._action_eip_startstop = QtGui.QAction("", self) |