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

Proposed by Michael Terry
Status: Merged
Approved by: Robert Ancell
Approved revision: 594
Merged at revision: 603
Proposed branch: lp:~mterry/unity-greeter/kill-onboard
Merge into: lp:unity-greeter
Diff against target: 36 lines (+5/-1)
2 files modified
src/menubar.vala (+3/-1)
src/unity-greeter.vala (+2/-0)
To merge this branch: bzr merge lp:~mterry/unity-greeter/kill-onboard
Reviewer Review Type Date Requested Status
Unity Greeter Development Team Pending
Review via email: mp+126075@code.launchpad.net

Description of the change

It seems the kill code in ~MenuBar is never triggered. Instead, this branch emits a signal before actually starting the session, so that MenuBar knows when to cleanup.

Before this branch, I can reliably get an onboard crash report. With the branch, I don't.

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/menubar.vala'
2--- src/menubar.vala 2012-09-12 14:43:30 +0000
3+++ src/menubar.vala 2012-09-24 19:15:24 +0000
4@@ -166,9 +166,11 @@
5 }
6
7 setup_indicators ();
8+
9+ UnityGreeter.singleton.starting_session.connect (cleanup);
10 }
11
12- ~MenuBar ()
13+ public void cleanup ()
14 {
15 if (keyboard_pid != 0)
16 {
17
18=== modified file 'src/unity-greeter.vala'
19--- src/unity-greeter.vala 2012-09-04 14:45:06 +0000
20+++ src/unity-greeter.vala 2012-09-24 19:15:24 +0000
21@@ -26,6 +26,7 @@
22 public signal void show_message (string text, LightDM.MessageType type);
23 public signal void show_prompt (string text, LightDM.PromptType type);
24 public signal void authentication_complete ();
25+ public signal void starting_session ();
26
27 public bool test_mode = false;
28
29@@ -161,6 +162,7 @@
30 }
31 else
32 {
33+ starting_session ();
34 try
35 {
36 greeter.start_session_sync (session);

Subscribers

People subscribed via source and target branches