Merge remote-tracking branch 'origin/v2.2'

This commit is contained in:
Adolfo Gómez García 2018-02-12 11:04:53 +01:00
commit c9075bfa0f
2 changed files with 4 additions and 4 deletions

View File

@ -10,7 +10,7 @@ Package: udsactor
Section: admin Section: admin
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: policykit-1(>=0.100), python-requests (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python-prctl(>=1.1.1), python (>=2.7), libxss1, ${misc:Depends} Depends: policykit-1(>=0.100), python-requests (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python-prctl(>=1.1.1), python (>=2.7), libxss1, xscreensaver, ${misc:Depends}
Description: Actor for Universal Desktop Services (UDS) Broker Description: Actor for Universal Desktop Services (UDS) Broker
This package provides the required components to allow this machine to work on an environment managed by UDS Broker. This package provides the required components to allow this machine to work on an environment managed by UDS Broker.

View File

@ -313,9 +313,9 @@ class UDSSystemTray(QtGui.QSystemTrayIcon):
if __name__ == '__main__': if __name__ == '__main__':
app = QtGui.QApplication(sys.argv) app = QtGui.QApplication(sys.argv)
if not QtGui.QSystemTrayIcon.isSystemTrayAvailable(): #if not QtGui.QSystemTrayIcon.isSystemTrayAvailable():
# QtGui.QMessageBox.critical(None, "Systray", "I couldn't detect any system tray on this system.") # # QtGui.QMessageBox.critical(None, "Systray", "I couldn't detect any system tray on this system.")
sys.exit(1) # sys.exit(1)
# This is important so our app won't close on message windows # This is important so our app won't close on message windows
QtGui.QApplication.setQuitOnLastWindowClosed(False) QtGui.QApplication.setQuitOnLastWindowClosed(False)