[logind] Correct property name to fix logind session
ClosedPublic

Authored by subdiff on Wed, Jul 12, 9:06 PM.

Details

Summary

In D6291 a small naming mistake led to Wayland session with logind not working anymore. Patch to make it work again.

Diff Detail

Repository
R108 KWin
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
subdiff created this revision.Wed, Jul 12, 9:06 PM
Restricted Application added a subscriber: kwin. · View Herald TranscriptWed, Jul 12, 9:06 PM
broulik added inline comments.
logind.cpp
67

Should the variable also be named Active?

subdiff added inline comments.
logind.cpp
67

Yea, thought about it. It was probably called s_login1ActivateProperty for now because in the ConsoleKit case it has the value "activate".

But IMO calling it s_login1ActiveProperty as you proposed would make more sense because the variable/value describes a status. I can change it if others (@erickoegel?) think the same. Either with this diff or in a seperate one.

Oh wow, yes the property for logind is "Active" and in ConsoleKit2 "active". My brain must have gone out to lunch there when cleaning up the diff to submit it. So s_login1ActiveProperty/s_ck2ActiveProperty makes sense. Sorry about that.

subdiff updated this revision to Diff 16653.Thu, Jul 13, 1:52 PM

Also change the variable names.

subdiff marked 2 inline comments as done.Thu, Jul 13, 1:53 PM
graesslin accepted this revision.Thu, Jul 13, 4:50 PM
graesslin added a subscriber: graesslin.

That means my session worked again for at least a week! Wohoo the stability starts to reach the state of Pre-Qt 5.9

This revision is now accepted and ready to land.Thu, Jul 13, 4:50 PM
This revision was automatically updated to reflect the committed changes.
cfeck added a subscriber: cfeck.Fri, Jul 14, 11:10 PM
cfeck added inline comments.
logind.cpp
75

Does this need to be changed, too?

erickoegel added inline comments.Sat, Jul 15, 4:12 AM
logind.cpp
75

Yes, it should be "active" as well. Sorry about that.

usta added a subscriber: usta.Sat, Jul 15, 6:49 AM
usta added inline comments.
logind.cpp
217

is this will be Active or Activate

graesslin added inline comments.Sat, Jul 15, 9:01 AM
subdiff marked an inline comment as done.Sat, Jul 15, 9:19 AM
subdiff added inline comments.
logind.cpp
217

Activate should be right here. Here it's an action (to "Activate" the session) and not a status (is the session currently "Active"?).

subdiff marked 2 inline comments as done.Sat, Jul 15, 9:20 AM
erickoegel added inline comments.Sat, Jul 15, 11:04 AM
logind.cpp
75

That's correct, thanks!