← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to bin/ubiquity-dm

  • Committer: Rohan Garg
  • Date: 2014-07-18 14:45:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6199.
  • Revision ID: rohangarg@kubuntu.org-20140718144507-xbwoa21sc5g63487
Make sure ubiquity-dm works on Plasma 5 KWin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
575
575
            log("add_ubiquity_kdedir")
576
576
            add_ubiquity_kdedir()
577
577
            log('start kwin')
 
578
            if osextras.find_on_path('kwin'):
 
579
                wm_cmd = [ 'kwin']
 
580
            elif osextras.find_on_path('kwin_x11'):
 
581
                wm_cmd = [ 'kwin_x11' ]
578
582
            wm = subprocess.Popen(
579
 
                'kwin', stdin=null, stdout=logfile, stderr=logfile,
 
583
                wm_cmd, stdin=null, stdout=logfile, stderr=logfile,
580
584
                preexec_fn=self.drop_privileges)
581
585
 
582
586
        log('start greeter')