diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 10:51:35 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 19:43:02 +0100 |
| commit | 1124d1036984f920dcd5b2caec9ff8fe2d788b8a (patch) | |
| tree | 6e0c626f33ee58e5888ceb4a11608f2103a34d16 /tools | |
| parent | bbf0eed8d146602e81e64e9bc6d1c451c260b52f (diff) | |
| parent | f1f61ff703db72cc1db7f834c9cb45616d55da10 (diff) | |
Merge branch 'backport' into work
Diffing against the old work branch where most of the changes
in backport were cherry-picked from indicates this should be
alright. (0de9097017d4d1991388a35e380a57dc1135b431)
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/xdg-autostart/xdg-autostart | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/xdg-autostart/xdg-autostart b/tools/xdg-autostart/xdg-autostart index daa9117d..95ee5f51 100755 --- a/tools/xdg-autostart/xdg-autostart +++ b/tools/xdg-autostart/xdg-autostart @@ -67,7 +67,7 @@ def main(argv=sys.argv): if list: autofile.list(environments) else: autofile.run(environments) -class AutostartFile(): +class AutostartFile: def __init__(self, path): self.path = path self.filename = os.path.basename(path) @@ -178,7 +178,7 @@ def show_help(): print " --version Show version and copyright information" print print "ENVIRONMENT specifies a list of environments for which to run autostart" - print "applications for. If none are specified, only applications which do not " + print "applications. If none are specified, only applications which do not " print "limit themselves to certain environments will be run." print print "ENVIRONMENT can be one or more of:" |