From 6676260308b5412a368f6c9ea402af985d193307 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Thu, 26 Feb 2009 13:08:42 -0500
Subject: [PATCH] Don't try to respawn metacity and the panel if we didn't kill
 them.

Also, don't crash out of the python script if metacity-clutter crashes
---
 .gitignore         | 1 +
 src/gnome-shell.in | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d6060934..4d4c17e92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
 src/gnomeshell-taskpanel
+src/gnome-shell
 stamp-h1
diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 84c804ec0..5a1cac6b2 100755
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -235,13 +235,16 @@ try:
         print "Shell is dead"
 
 except KeyboardInterrupt, e:
-    os.kill(shell.pid, signal.SIGKILL)
+    try:
+        os.kill(shell.pid, signal.SIGKILL)
+    except:
+        pass
     shell.wait()
     if options.verbose:
         print "Shell killed"
 
 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
         if options.verbose:
             print "Restarting Metacity and Gnome Panel"