[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request 124469: ConsoleKit2 support for screenlocker
From: "David Edmundson" <david () davidedmundson ! co ! uk>
Date: 2015-07-26 7:43:54
Message-ID: 20150726074354.21960.65074 () mimi ! kde ! org
[Download RAW message or body]
--===============2860242212077661804==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124469/#review82970
-----------------------------------------------------------
ksmserver/screenlocker/logind.h (line 67)
<https://git.reviewboard.kde.org/r/124469/#comment57258>
Can consolekit actually close and restart whilst a session is open?
Is it ever possible to see both logind and consolekit? If so our \
connected=true/false can get potentially broken.
ksmserver/screenlocker/logind.h (line 70)
<https://git.reviewboard.kde.org/r/124469/#comment57261>
our normal naming is m_lowerCamelCase
also, can you set these to 0.
const QString *m_service = 0;
I know you set these before use but it makes debugging a backtrace easier if they \
do ever get used early somewhere in the future
ksmserver/screenlocker/logind.cpp (line 185)
<https://git.reviewboard.kde.org/r/124469/#comment57260>
we should check m_connected here
otherwise there's a code path where we have neither logind or console kit, \
m_service is invalid and we crash
(ksldapp.cpp:280 doesn't check and will call inhibit regardless of connection \
state)
- David Edmundson
On July 26, 2015, 7:13 a.m., Eric Koegel wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/124469/
> -----------------------------------------------------------
>
> (Updated July 26, 2015, 7:13 a.m.)
>
>
> Review request for Plasma.
>
>
> Repository: plasma-workspace
>
>
> Description
> -------
>
> ConsoleKit2 has the same API as systemd-logind for Lock, Unlock,
> PrepareForSleep, and Inhibit. This patch adds the functionality
> for ConsoleKit2 while attempting to minimize code duplication.
>
>
> Diffs
> -----
>
> ksmserver/screenlocker/logind.h 9983673
> ksmserver/screenlocker/logind.cpp 5335b15
>
> Diff: https://git.reviewboard.kde.org/r/124469/diff/
>
>
> Testing
> -------
>
> dbus-send --system --dest=org.freedesktop.ConsoleKit --type=method_call \
> --print-reply --reply-timeout=2000 /org/freedesktop/ConsoleKit/Manager \
> org.freedesktop.ConsoleKit.Manager.ListInhibitors method return sender=:1.1 -> \
> dest=:1.80 reply_serial=2 array [
> struct {
> string "suspend"
> string "NetworkManager"
> string "NetworkManager needs to turn off networks"
> string "delay"
> uint32 0
> uint32 3473
> }
> struct {
> string "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"
> string "PowerDevil"
> string "KDE handles power events"
> string "block"
> uint32 1000
> uint32 9587
> }
> struct {
> string "suspend"
> string "Screen Locker"
> string "Ensuring that the screen gets locked before going to sleep"
> string "delay"
> uint32 1000
> uint32 9508
> }
> ]
>
> Verified ConsoleKit2 does delay suspending until both delay locks are removed.
>
>
> Thanks,
>
> Eric Koegel
>
>
--===============2860242212077661804==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/124469/">https://git.reviewboard.kde.org/r/124469/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/124469/diff/1/?file=387737#file387737line67" \
style="color: black; font-weight: bold; text-decoration: \
underline;">ksmserver/screenlocker/logind.h</a> <span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
">private:</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">67</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">QDBusServiceWatcher</span> <span class="o">*</span><span \
class="n">m_consolekitServiceWatcher</span><span class="p">;</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Can \
consolekit actually close and restart whilst a session is open?</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">Is it ever possible to see both logind and consolekit? If so our \
connected=true/false can get potentially broken.</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/124469/diff/1/?file=387737#file387737line70" \
style="color: black; font-weight: bold; text-decoration: \
underline;">ksmserver/screenlocker/logind.h</a> <span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
">private:</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">70</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">const</span> <span class="n">QString</span> <span class="o">*</span><span \
class="n">m_Service</span><span class="p">;</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">our \
normal naming is m_lowerCamelCase</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">also, can you set these \
to 0.</p> <p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">const QString *m_service = 0; I know you set these \
before use but it makes debugging a backtrace easier if they do ever get used early \
somewhere in the future</p></pre> </div>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/124469/diff/1/?file=387738#file387738line186" \
style="color: black; font-weight: bold; text-decoration: \
underline;">ksmserver/screenlocker/logind.cpp</a> <span style="font-weight: \
normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void \
LogindIntegration::inhibit()</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">135</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="p">{</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">185</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "><span class="p">{</span></pre></td> </tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">we \
should check m_connected here otherwise there's a code path where we have neither \
logind or console kit, m_service is invalid and we crash</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">(ksldapp.cpp:280 doesn't check and will call inhibit regardless of \
connection state)</p></pre> </div>
</div>
<br />
<p>- David Edmundson</p>
<br />
<p>On July 26th, 2015, 7:13 a.m. UTC, Eric Koegel wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Plasma.</div>
<div>By Eric Koegel.</div>
<p style="color: grey;"><i>Updated July 26, 2015, 7:13 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-workspace
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">ConsoleKit2 has the same API as systemd-logind for \
Lock, Unlock, PrepareForSleep, and Inhibit. This patch adds the functionality
for ConsoleKit2 while attempting to minimize code duplication.</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">dbus-send --system --dest=org.freedesktop.ConsoleKit \
--type=method_call --print-reply --reply-timeout=2000 \
/org/freedesktop/ConsoleKit/Manager \
org.freedesktop.ConsoleKit.Manager.ListInhibitors method return sender=:1.1 -> \
dest=:1.80 reply_serial=2 array [
struct {
string "suspend"
string "NetworkManager"
string "NetworkManager needs to turn off networks"
string "delay"
uint32 0
uint32 3473
}
struct {
string "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"
string "PowerDevil"
string "KDE handles power events"
string "block"
uint32 1000
uint32 9587
}
struct {
string "suspend"
string "Screen Locker"
string "Ensuring that the screen gets locked before going to sleep"
string "delay"
uint32 1000
uint32 9508
}
]</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Verified ConsoleKit2 does delay suspending until both \
delay locks are removed.</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>ksmserver/screenlocker/logind.h <span style="color: grey">(9983673)</span></li>
<li>ksmserver/screenlocker/logind.cpp <span style="color: \
grey">(5335b15)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/124469/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============2860242212077661804==--
[Attachment #3 (text/plain)]
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic