<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/121526/">https://git.reviewboard.kde.org/r/121526/</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/121526/diff/1/?file=333292#file333292line149" style="color: black; font-weight: bold; text-decoration: underline;">libs/declarative/connectionicon.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; ">QString ConnectionIcon::connectionTooltipIcon() const</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">141</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="p">(</span><span class="n">vpnConnection</span> <span class="o">&&</span> <span class="p">(</span><span class="n">vpnConnection</span><span class="o">-></span><span class="n">state</span><span class="p">()</span> <span class="o">==</span> <span class="n">NetworkManager</span><span class="o">::</span><span class="n">VpnConnection</span><span class="o">::</span><span class="n">Prepare</span> <span class="o">||</span></pre></td>
<th bgcolor="#ebb1ba" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></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;">I'm not sure if removing this is safe. I remember adding this check was necessary to make it work properly in some cases. If NM will update just VPN state and not ActiveConnection state, it won't show connecting indicator for a VPN connection which is being activated.</p></pre>
</div>
</div>
<br />
<p>- Jan Grulich</p>
<br />
<p>On prosinec 15th, 2014, 4:10 dop. UTC, Xuetian Weng 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 Solid and Jan Grulich.</div>
<div>By Xuetian Weng.</div>
<p style="color: grey;"><i>Updated Pro. 15, 2014, 4:10 dop.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-nm
</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;">m_connecting is not always maintained correctly, thus it causes some problem on plasmoid side. In the old code, if there are multiple connections, activeConnectionDestroy might set connecting to wrong value if there's another connection connecting.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This patch introduce ConnectionIcon::setStates() function, which always scan through all active connections (number of active connections is relatively small so it won't affect performance), and set connecting to true if any connection is in "Activtating" state.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This patch also introduces set{Connecting,ConnectionIcon,ConnectionTooltipIcon,Vpn,Limited} function, to emit the corresponding signal when the value actually changes.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Some old code in activeConnectionAdded is now moved to addActiveConection, whose job is to connect to the destroyed signal and state changed signal on active connection. actionConnectionAdded now calls addActiveConnection() and setStates() to preserve the old behavior. This separation is also necessary for the constructor so we can call setStates() only once in the constructor.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Another small change in QML is to stop busy indicator when plasmoid is not expanded, or busy indicator is not visible.</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;">Connect on a wifi connection when wifi is connected now correctly triggers busy indicator in compact representation.</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>applet/contents/ui/ConnectionItem.qml <span style="color: grey">(480ce99)</span></li>
<li>libs/declarative/connectionicon.h <span style="color: grey">(e6e28af)</span></li>
<li>libs/declarative/connectionicon.cpp <span style="color: grey">(7e76a0a)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/121526/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>