brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to respawn metacity and the panel if we didn't kill them.

Browse Source 
Also, don't crash out of the python script if metacity-clutter crashes
This commit is contained in:
Dan Winship 2009-02-26 13:08:42 -05:00
parent 84aec28575
commit 6676260308
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,4 +25,5 @@ src/*-marshal.[ch]
src/Makefile src/Makefile
src/Makefile.in src/Makefile.in
src/gnomeshell-taskpanel src/gnomeshell-taskpanel
src/gnome-shell
stamp-h1 stamp-h1

5
src/gnome-shell.in
View File

@ -235,13 +235,16 @@ try:
print "Shell is dead" print "Shell is dead"
except KeyboardInterrupt, e: except KeyboardInterrupt, e:
try:
os.kill(shell.pid, signal.SIGKILL) os.kill(shell.pid, signal.SIGKILL)
except:
pass
shell.wait() shell.wait()
if options.verbose: if options.verbose:
print "Shell killed" print "Shell killed"
finally: finally:
if metacity_pid or gnome_panel_pid: if not run_in_xephyr and (metacity_pid or gnome_panel_pid):
# Restart gnome-panel and window manager # Restart gnome-panel and window manager
if options.verbose: if options.verbose:
print "Restarting Metacity and Gnome Panel" print "Restarting Metacity and Gnome Panel"