nikdoof/oblogout
1
0
Fork 0
mirror of https://github.com/nikdoof/oblogout.git synced 2025-12-22 14:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

When running in command mode, config checker now checks to see if the button

Browse Source 
has a valid command, if not, remove the button.
This commit is contained in:
Andrew Williams
2009-05-14 17:23:56 +01:00
parent e0ceac0197
commit 05d70532ed
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
oblogout/__init__.py
View File

@@ -223,7 +223,9 @@ class OpenboxLogout():
for key in self.parser.items("commands"):
self.logger.debug("Setting cmd_%s as %s" % (key[0], key[1]))
if key[1] in ['logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend', 'lock', 'switch']:
if key[1]: setattr(self, "cmd_" + key[0], key[1])
if key[1]:
self.logger.debug("Setting cmd_%s as %s" % (key[0], key[1]))
setattr(self, "cmd_" + key[0], key[1])
# Load theme information from local directory if local mode is set
if self.local_mode:
@@ -264,6 +266,13 @@ class OpenboxLogout():
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 len(list) == 0:
self.logger.warning(_("No valid buttons found, resetting to defaults"))