<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/100369/">http://git.reviewboard.kde.org/r/100369/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The result looks very good. I think you forgot to merge with master before making this patch though.</pre>
<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="http://git.reviewboard.kde.org/r/100369/diff/1/?file=6646#file6646line50" style="color: black; font-weight: bold; text-decoration: underline;">src/KCMTelepathyAccounts/account-edit-widget.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; ">public:</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">50</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">Ui</span><span class="o">::</span><span class="n">AccountEditWidget</span> <span class="o"><span class="hl">*</span></span><span class="n">ui</span><span class="p">;</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">49</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">Ui</span><span class="o">::</span><span class="n">AccountEditWidget</span> <span class="n">ui</span><span class="p">;</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Another change undone</pre>
</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="http://git.reviewboard.kde.org/r/100369/diff/1/?file=6646#file6646line56" style="color: black; font-weight: bold; text-decoration: underline;">src/KCMTelepathyAccounts/account-edit-widget.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; ">public:</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">55</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">protocol</span><span class="p">,</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Why did you change this? Just passing ProtocolInfo looks much better.</pre>
</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="http://git.reviewboard.kde.org/r/100369/diff/1/?file=6646#file6646line137" style="color: black; font-weight: bold; text-decoration: underline;">src/KCMTelepathyAccounts/account-edit-widget.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 AccountEditWidget::loadWidgets()</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">129</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">d</span><span class="o">-></span><span class="n">mainOptionsWidget</span><span class="o">-></span><span class="n">layout</span><span class="p">()</span><span class="o">-></span><span class="n">setContentsMargins</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</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>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Hmm, i think you forgot to merge with master</pre>
</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="http://git.reviewboard.kde.org/r/100369/diff/1/?file=6648#file6648line75" style="color: black; font-weight: bold; text-decoration: underline;">src/KCMTelepathyAccounts/parameter-edit-widget.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; ">ParameterEditWidget::ParameterEditWidget(Tp::ProtocolParameterList parameters,</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">75</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">delete</span> <span class="n">d</span><span class="o">-></span><span class="n">ui</span><span class="p">;</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>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Again, this should stay</pre>
</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="http://git.reviewboard.kde.org/r/100369/diff/1/?file=6658#file6658line103" style="color: black; font-weight: bold; text-decoration: underline;">src/accounts-list-model.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; ">QVariant AccountsListModel::data(const QModelIndex &index, int role) const</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">103</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span><span class="p">(</span><span class="n">m_accounts</span><span class="p">.</span><span class="n">at</span><span class="p">(</span><span class="n">index</span><span class="p">.</span><span class="n">row</span><span class="p">())</span><span class="o">-></span><span class="n">account</span><span class="p">())</span> <span class="p">{</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Why did you add this? There should not be a possibility that accounts get deleted without removing them from the model right?</pre>
</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="http://git.reviewboard.kde.org/r/100369/diff/1/?file=6661#file6661line37" style="color: black; font-weight: bold; text-decoration: underline;">src/kcm-telepathy-accounts.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="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">namespace Ui {</pre></td>
<td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">35</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="n">namespace</span> <span class="n">Ui</span> <span class="p">{</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">37</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="n">class</span> <span class="n">KCMTelepathyAccounts</span> <span class="o">:</span> <span class="n">public</span> <span class="n">KCModule</span><span class="p">,</span> <span class="n">Ui</span><span class="o">::</span><span class="n">MainWidget</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">You undid my change here to use pointers instead of multiple inheritance</pre>
</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="http://git.reviewboard.kde.org/r/100369/diff/1/?file=6662#file6662line121" style="color: black; font-weight: bold; text-decoration: underline;">src/kcm-telepathy-accounts.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="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void KCMTelepathyAccounts::onAccountModelChange(const QModelIndex &index, const QVariant &value, int role)</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">117</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="kt">void</span> <span class="n">KCMTelepathyAccounts</span><span class="o">::</span><span class="n">onAccountModelChange</span><span class="p">(</span><span class="k">const</span> <span class="n">QModelIndex</span> <span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="k">const</span> <span class="n">QVariant</span> <span class="o">&</span><span class="n">value</span><span class="p">,</span> <span class="kt">int</span> <span class="n">role</span><span class="p">)</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The name seems a little unfortunate to me, as you're actually changing the data in the model</pre>
</div>
<br />
<p>- Thomas</p>
<br />
<p>On January 12th, 2011, 1:14 a.m., David Edmundson wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Telepathy.</div>
<div>By David Edmundson.</div>
<p style="color: grey;"><i>Updated Jan. 12, 2011, 1:14 a.m.</i></p>
<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;">Added 3 new roles to the account model. Connection as a string (online, connecting, disconnected), and as an icon.
Also added a string which says why the user is offline.
(because the account is disabled, because the password is wrong, network error etc)
Then created an Item Delegate for the accounts view that looks pretty.</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;">Opened concurrently in both empathy and the accounts KCM, checked online state changed correctly, and that the "enabled" flag worked.
Tried accounts with network errors and incorrect passwords.</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>src/CMakeLists.txt <span style="color: grey">(6ebed1268e697b9816ac0620467605c71324b3ef)</span></li>
<li>src/KCMTelepathyAccounts/account-edit-widget.h <span style="color: grey">(4c78338603dc0b88230b52190ca9d373dff2628d)</span></li>
<li>src/KCMTelepathyAccounts/account-edit-widget.cpp <span style="color: grey">(b554db71a17a4c9664d04f781561ce62cbc17562)</span></li>
<li>src/KCMTelepathyAccounts/account-edit-widget.ui <span style="color: grey">(6387e2be80747b8721bef9934258d2d489cd8cac)</span></li>
<li>src/KCMTelepathyAccounts/parameter-edit-widget.cpp <span style="color: grey">(187c39fbf990b610b8985d1869d48bc2be7c9c6d)</span></li>
<li>src/KCMTelepathyAccounts/parameter-edit-widget.ui <span style="color: grey">(25a2453d5a85ebe3f646c28e7acdb728ca14f1fa)</span></li>
<li>src/KCMTelepathyAccounts/protocol-item.h <span style="color: grey">(90b96ee4ac6f4185a74a4d197b47ee1830564a43)</span></li>
<li>src/KCMTelepathyAccounts/protocol-item.cpp <span style="color: grey">(03ac0bceff0f32673a706329f698a66323842c69)</span></li>
<li>src/KCMTelepathyAccounts/protocol-select-widget.cpp <span style="color: grey">(fa4b3c6d49d2287b63ba64730e1ec034508e8c55)</span></li>
<li>src/account-item.h <span style="color: grey">(75e24116c525e2315c9d8f622d3b2fcb1c5c1bb8)</span></li>
<li>src/account-item.cpp <span style="color: grey">(50afaa54c96ad51b6775f954cc180d1e12bbe96b)</span></li>
<li>src/accounts-list-delegate.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/accounts-list-delegate.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/accounts-list-model.h <span style="color: grey">(815719a08b1a3091d007a6ef30ab1131fd8b489c)</span></li>
<li>src/accounts-list-model.cpp <span style="color: grey">(e0cf9bd13c7f1af8e8d936fe3e66af6db3aefdbc)</span></li>
<li>src/add-account-assistant.cpp <span style="color: grey">(3933763957b1448aacf9e6c7efbc6b296a5e3664)</span></li>
<li>src/edit-account-dialog.cpp <span style="color: grey">(73462f2e2a93e22e6d5d67297c575f4e10d44c5c)</span></li>
<li>src/kcm-telepathy-accounts.h <span style="color: grey">(513db22457c2b77b4e36d54689d3b16810ac6854)</span></li>
<li>src/kcm-telepathy-accounts.cpp <span style="color: grey">(c2579d2eb38c371f23e86f0a468f1ce90ef75b88)</span></li>
<li>src/main-widget.ui <span style="color: grey">(b8ad1e5e243f923240382eda22414347ae173907)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/100369/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Screenshots </h1>
<div>
<a href="http://git.reviewboard.kde.org/r/100369/s/42/"><img src="http://git.reviewboard.kde.org/media/uploaded/images/2011/01/12/account_config_finished_400x100.png" style="border: 1px black solid;" alt="" /></a>
</div>
</td>
</tr>
</table>
</div>
</body>
</html>