[clutter/wip/wayland: 15/45] test-wayland-surface: don't stop x on error if not started

[Robert Bragg <rbragg src gnome org>]

commit 072af4ed9b7b79f4ebda47698cb9bf2f4f076829
Author: Robert Bragg <robert linux intel com>
Date:   Sat Jan 7 22:39:00 2012 +0000

    test-wayland-surface: don't stop x on error if not started
    
    The point where xwayland is started was changed but some error handling
    code wasn't updated so we might needlessly try and stop the xserver
    that we know hasn't been started yet.

 tests/interactive/test-wayland-surface.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/tests/interactive/test-wayland-surface.c b/tests/interactive/test-wayland-surface.c
index d2a4bf2..88d4278 100644
--- a/tests/interactive/test-wayland-surface.c
+++ b/tests/interactive/test-wayland-surface.c
@@ -1110,18 +1110,12 @@ test_wayland_surface_main (int argc, char **argv)
 
   if (wl_display_add_global (compositor.wayland_display, &wl_shell_interface,
                              &compositor, bind_shell) == NULL)
-    {
-      stop_xwayland (&compositor);
-      g_error ("Failed to register a global shell object");
-    }
+    g_error ("Failed to register a global shell object");
 
   clutter_actor_show (compositor.stage);
 
   if (wl_display_add_socket (compositor.wayland_display, "wayland-0"))
-    {
-      stop_xwayland (&compositor);
-      g_error ("Failed to create socket");
-    }
+    g_error ("Failed to create socket");
 
   wl_display_add_global (compositor.wayland_display,
                          &xserver_interface,