← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to bin/ubiquity-dm

  • Committer: Julien Lavergne
  • Date: 2010-11-22 20:06:21 UTC
  • mto: This revision was merged to the branch mainline in revision 4439.
  • Revision ID: gilir@ubuntu.com-20101122200621-kzbv0gsrhyqs5b0p
https://launchpad.net/bugs/546445
* debian/ubiquity.ubiquity.upstart:
 - Add lxdm support.
* Add support for openbox-lubuntu and lxsession for ubiquity-dm (LP: #546445)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
350
350
                wm_cmd = ['xfwm4']
351
351
            elif osextras.find_on_path('matchbox-window-manager'):
352
352
                wm_cmd = ['matchbox-window-manager']
 
353
            elif osextras.find_on_path('openbox-lubuntu'):
 
354
                wm_cmd = ['openbox-lubuntu']
353
355
            else:
354
356
                raise MissingProgramError, \
355
357
                    ("No window manager found (tried metacity, xfwm4, "
356
 
                     "matchbox-window-manager)")
 
358
                     "matchbox-window-manager, openbox-lubuntu)")
357
359
            wm = subprocess.Popen(wm_cmd,
358
360
                stdin=null, stdout=logfile, stderr=logfile,
359
361
                **maybe_drop_privileges)
376
378
                    stdin=null, stdout=logfile, stderr=logfile,
377
379
                    **maybe_drop_privileges))
378
380
 
 
381
            if osextras.find_on_path('lxsession'):
 
382
                extras.append(subprocess.Popen(
 
383
                    ['lxsession','-s','Lubuntu', '-e', 'LXDE', '-a'],
 
384
                    stdin=null, stdout=logfile, stderr=logfile,
 
385
                    **maybe_drop_privileges))
 
386
 
379
387
            if os.path.exists('/usr/lib/ubiquity/panel') and "xfwm4" not in wm_cmd:
380
388
                extras.append(subprocess.Popen(
381
389
                    ['/usr/lib/ubiquity/panel'],