Merge branch 'backport' into work

Conflicts:
	openbox/config.c
	openbox/event.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	openbox/screen.h

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/xdg-autostart/xdg-autostart b/tools/xdg-autostart/xdg-autostart
index 64f26dc8..4a533826 100755
--- a/tools/xdg-autostart/xdg-autostart
+++ b/tools/xdg-autostart/xdg-autostart
@@ -80,7 +80,7 @@ class AutostartFile:
     def __str__(self):
         return self.path + " : " + self.de.getName()
 
-    def _isexecfile(path):
+    def _isexecfile(self, path):
         return os.access(path, os.X_OK)
 
     def _findFile(self, path, search, match_func):