Unity Greeter

Merge lp:~mterry/unity-greeter/sigterm-onboard into lp:unity-greeter

  1. sigterm-onboard
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Robert Ancell
Approved revision: 610
Merged at revision: 615
Proposed branch: lp:~mterry/unity-greeter/sigterm-onboard
Merge into: lp:unity-greeter
Diff against target: 12 lines (+1/-1)
1 file modified
src/menubar.vala (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity-greeter/sigterm-onboard
Reviewer Review Type Date Requested Status
Unity Greeter Development Team Pending
Review via email: mp+127782@code.launchpad.net
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
=== modified file 'src/menubar.vala'
--- src/menubar.vala 2012-09-24 19:12:46 +0000
+++ src/menubar.vala 2012-10-03 14:40:30 +0000
@@ -174,7 +174,7 @@
174 {174 {
175 if (keyboard_pid != 0)175 if (keyboard_pid != 0)
176 {176 {
177 Posix.kill (keyboard_pid, Posix.SIGKILL);177 Posix.kill (keyboard_pid, Posix.SIGTERM);
178 int status;178 int status;
179 Posix.waitpid (keyboard_pid, out status, 0);179 Posix.waitpid (keyboard_pid, out status, 0);
180 keyboard_pid = 0;180 keyboard_pid = 0;

Subscribers

People subscribed via source and target branches