nikdoof/oblogout
1
0
Fork 0
mirror of https://github.com/nikdoof/oblogout.git synced 2025-12-13 01:32:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes LP #376736 - Last button unvalidated.

Browse Source
This commit is contained in:
Andrew Williams
2009-11-18 00:01:50 +00:00
parent cf346d3719
commit 350d3ce38d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
oblogout/__init__.py
View File

@@ -257,21 +257,25 @@ class OpenboxLogout():
# Validate the button list
for button in list:
self.logger.debug(_("Validating button: %s" % button))
if not button in validbuttons:
self.logger.warning(_("Button %s is not a valid button name, removing") % button)
list.remove(button)
else:
if self.usehal:
if self.usehal and button in ['restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend']:
if not self.dbus.check_ability(button):
self.logger.warning(_("Can't %s, disabling button" % button))
list.remove(button)
else:
try:
if button != "cancel" and getattr(self, "cmd_" + button) == "None":
list.remove(button)
except:
self.logger.warning(_("Command for button %s is undefined, removing." % button))
list.remove(button)
if button != "cancel":
try:
self.logger.debug(_("Cmd Value for %s: %s" % (button, getattr(self, "cmd_" + button))))
if getattr(self, "cmd_" + button) == "None":
self.logger.warning(_("Command for button %s is undefined, removing." % button))
list.remove(button)
except:
self.logger.warning(_("Command for button %s is undefined, removing." % button))
list.remove(button)
if len(list) == 0:
self.logger.warning(_("No valid buttons found, resetting to defaults"))