Merge lp:~seb128/unity-control-center/lightdm-login-history into lp:unity-control-center

Proposed by Sebastien Bacher on 2016-08-17
Status: Merged
Approved by: Sebastien Bacher on 2016-09-23
Approved revision: 12867
Merged at revision: 12874
Proposed branch: lp:~seb128/unity-control-center/lightdm-login-history
Merge into: lp:unity-control-center
Diff against target: 15 lines (+4/-2)
1 file modified
panels/user-accounts/um-history-dialog.c (+4/-2)
To merge this branch: bzr merge lp:~seb128/unity-control-center/lightdm-login-history
Reviewer Review Type Date Requested Status
Robert Ancell 2016-08-17 Approve on 2016-09-06
Review via email: mp+303118@code.launchpad.net

Commit message

Revert the change from r12750 to include only graphical sessions.
Lightdm changed the format of its utmp records which made u-c-c stop
listing any user login (lp: #1380364)

Description of the change

Revert the change from r12750 to include only graphical sessions.
Lightdm changed the format of its utmp records which made u-c-c stop
listing any user login (lp: #1380364)

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/user-accounts/um-history-dialog.c'
2--- panels/user-accounts/um-history-dialog.c 2014-04-04 13:44:16 +0000
3+++ panels/user-accounts/um-history-dialog.c 2016-08-17 10:25:15 +0000
4@@ -249,8 +249,10 @@
5 break;
6 }
7
8- /* Display only x-session records */
9- if (!g_str_has_prefix (history.type, ":")) {
10+ /* Display only x-session and tty records */
11+ if (!g_str_has_prefix (history.type, ":") &&
12+ !g_str_has_prefix (history.type, "tty")&&
13+ !g_str_has_prefix (history.type, "pts")) {
14 continue;
15 }
16

Subscribers

People subscribed via source and target branches