Session Menu

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

  1. no-lock
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 141
Proposed branch: lp:~ted/indicator-session/no-lock
Merge into: lp:indicator-session/0.1
Diff against target: 12 lines (+1/-1)
1 file modified
src/session-service.c (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-session/no-lock
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+52932@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/session-service.c'
2--- src/session-service.c 2011-03-10 21:22:57 +0000
3+++ src/session-service.c 2011-03-10 22:04:59 +0000
4@@ -424,7 +424,7 @@
5 g_warning("Unable to activate guest session, falling back to command line activation.");
6 }
7
8- if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER, &error)) {
9+ if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER " --no-lock", &error)) {
10 g_warning("Unable to start guest session: %s", error->message);
11 g_error_free(error);
12 }

Subscribers

People subscribed via source and target branches