← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to bin/ubiquity-dm

  • Committer: Colin Watson
  • Date: 2008-05-07 23:42:11 UTC
  • Revision ID: cjwatson@canonical.com-20080507234211-xs4fgnnpx8amjj4a
Add ubiquity-dm implementation for matchbox-window-manager (thanks,
Patrick Hétu; see LP #159363).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
160
160
                wm = subprocess.Popen('xfwm4',
161
161
                    stdin=null, stdout=logfile, stderr=logfile,
162
162
                    **maybe_drop_privileges)
 
163
            elif osextras.find_on_path('matchbox-window-manager'):
 
164
                wm = subprocess.Popen('matchbox-window-manager',
 
165
                    stdin=null, stdout=logfile, stderr=logfile,
 
166
                    **maybe_drop_privileges)
163
167
            else:
164
168
                raise MissingProgramError, \
165
 
                    "No window manager found (tried metacity, xfwm4)"
 
169
                    "No window manager found (tried metacity, xfwm4, matchbox-window-manager)"
166
170
 
167
171
            if os.path.exists('/usr/lib/gnome-settings-daemon/gnome-settings-daemon'):
168
172
                extras.append(subprocess.Popen(['/usr/lib/gnome-settings-daemon/gnome-settings-daemon'],