Merge lp:~ted/indicator-session/no-lock into lp:indicator-session/0.1

[Ted Gould]

Use the no lock feature of guest-session to ensure we don't lock twice.

=== modified file 'src/session-service.c'
--- src/session-service.c	2011-03-10 21:22:57 +0000
+++ src/session-service.c	2011-03-10 22:04:59 +0000
@@ -424,7 +424,7 @@
 		g_warning("Unable to activate guest session, falling back to command line activation.");
 	}
 
-	if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER, &error)) {
+	if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER " --no-lock", &error)) {
 		g_warning("Unable to start guest session: %s", error->message);
 		g_error_free(error);
 	}