← Back to branch summary

~mterry/ubuntu/natty/gnome-shell/wip

« back to all changes in this revision

Viewing changes to src/gnome-shell.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-09-30 23:09:56 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090930230956-7id5gx82lazdyz62
Tags: 2.27.3-0ubuntu1
https://launchpad.net/bugs/413096
* New upstream version
* debian/control:
  - depends on python since it's used in the wrapper 
    (lp: #413096)
  - updated gir requirement

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome-shell.in
253
253
normal_exit = False
254
254
 
255
255
try:
 
256
    shell = None
256
257
    if options.xephyr:
257
258
        xephyr = start_xephyr()
258
259
        # This makes us not grab the org.gnome.Panel name
281
282
        except OSError:
282
283
            pass
283
284
 
284
 
    if shell.returncode ==  0:
 
285
    if shell is None:
 
286
        print "Failed to start shell"
 
287
    elif shell.returncode == 0:
285
288
        normal_exit = True
286
289
        if options.verbose:
287
290
            print "Shell exited normally"