← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to bin/ubiquity-dm

  • Committer: Dimitri John Ledkov
  • Date: 2014-02-21 16:46:50 UTC
  • Revision ID: dimitri.ledkov@canonical.com-20140221164650-jgkbgrv0pnl4wyod
Launch unity-settings-daemon if available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
420
420
                        stdin=null, stdout=logfile, stderr=logfile,
421
421
                        preexec_fn=self.drop_privileges)
422
422
 
 
423
                usd = '/usr/lib/unity-settings-daemon/unity-settings-daemon'
423
424
                gsd = '/usr/lib/gnome-settings-daemon/gnome-settings-daemon'
424
 
                if osextras.find_on_path(gsd):
 
425
                if osextras.find_on_path(usd):
 
426
                    extras.append(subprocess.Popen(
 
427
                        [usd], stdin=null, stdout=logfile, stderr=logfile,
 
428
                        preexec_fn=self.drop_privileges))
 
429
 
 
430
                elif osextras.find_on_path(gsd):
425
431
                    extras.append(subprocess.Popen(
426
432
                        [gsd], stdin=null, stdout=logfile, stderr=logfile,
427
433
                        preexec_fn=self.drop_privileges))