<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/103551/">http://git.reviewboard.kde.org/r/103551/</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="http://git.reviewboard.kde.org/r/103551/diff/2/?file=46083#file46083line854" style="color: black; font-weight: bold; text-decoration: underline;">src/irc/nicksonline.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</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 NicksOnline::doCommand(QAction* id)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">815</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">else</span> <span class="nf">if</span> <span class="p">(</span> <span class="n">id</span> <span class="o">==</span> <span class="n">m_whois</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">849</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cp">#endif </span><span class="c1">// HAVE_KDEPIMLIBS</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;">This is in the wrong place, I see no reason to limit the ability to join a channel to only when KAddressbook is available.</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/103551/diff/2/?file=46083#file46083line868" style="color: black; font-weight: bold; text-decoration: underline;">src/irc/nicksonline.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</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 NicksOnline::doCommand(QAction* id)</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">862</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="c1">// default command ?</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;">This comment led to a porting error, thanks for reviewing :)</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/103551/diff/2/?file=46095#file46095line27" style="color: black; font-weight: bold; text-decoration: underline;">src/viewer/irccontextmenus.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">27</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cp">#include "linkaddressbook/addressbook.h"</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;">Merge conflict starts here..</pre>
</div>
<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;">Still working on merging this, stay tuned :)</pre>
<p>- Eli</p>
<br />
<p>On January 7th, 2012, 3:54 a.m. EST, Thomas Capricelli wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Konversation.</div>
<div>By Thomas Capricelli.</div>
<p style="color: grey;"><i>Updated Jan. 7, 2012, 3:54 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;">For people outthere like me that do not use KDE, the dependency on kdepim is a very huge one. We would very happily make the tradeoff of NOT being able to link nicknames to kde addressbook.
I guess you see the points, depending on kdepim brings two big problems
* installation/compilation : depending on kdepim brings half of kde packages, kdepim package and hence ugliness such as nepomuk/akonadi.
* at runtime, starting konversation, by the magic of dbus and KDE spaghetti runtime dependencies, it starts lot of unrelated KDE stuff daemons that takes both cpu and ram. I know this arg is denied by KDE zealot, but i stand on it.
So I did it. This patch allows compilation without kdepim. I've tried to keep the patch as minimal as possible of course.
I'm always on irc/freenode as 'orzel', and i'll be on #konversation for the next days.
Also, I do have commit rights on KDE (not sure about konversation proper, i did no follow the git migration very closely)</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;">cmake with kdepim installed and with kdepim not installed
compiles tested with kdepim not installed: compiles, link and work fine</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>CMakeLists.txt <span style="color: grey">(c8df038)</span></li>
<li>config-konversation.h.cmake <span style="color: grey">(4aaf9d1)</span></li>
<li>src/CMakeLists.txt <span style="color: grey">(a7ba9f4)</span></li>
<li>src/application.cpp <span style="color: grey">(038b403)</span></li>
<li>src/irc/nick.cpp <span style="color: grey">(298eafb)</span></li>
<li>src/irc/nickinfo.h <span style="color: grey">(20b8ef1)</span></li>
<li>src/irc/nickinfo.cpp <span style="color: grey">(e768d0d)</span></li>
<li>src/irc/nicksonline.h <span style="color: grey">(fbdd2cd)</span></li>
<li>src/irc/nicksonline.cpp <span style="color: grey">(8c9a4b1)</span></li>
<li>src/irc/outputfilter.cpp <span style="color: grey">(a7701e7)</span></li>
<li>src/irc/query.h <span style="color: grey">(3685a53)</span></li>
<li>src/irc/query.cpp <span style="color: grey">(1a432d4)</span></li>
<li>src/irc/server.h <span style="color: grey">(775cb7c)</span></li>
<li>src/irc/server.cpp <span style="color: grey">(f2d3168)</span></li>
<li>src/irc/serverison.h <span style="color: grey">(4500564)</span></li>
<li>src/irc/serverison.cpp <span style="color: grey">(f737b51)</span></li>
<li>src/konsolepanel.cpp <span style="color: grey">(14b32cc)</span></li>
<li>src/main.cpp <span style="color: grey">(f2c7a22)</span></li>
<li>src/mainwindow.cpp <span style="color: grey">(112dd39)</span></li>
<li>src/viewer/irccontextmenus.h <span style="color: grey">(40756d1)</span></li>
<li>src/viewer/irccontextmenus.cpp <span style="color: grey">(b735843)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/103551/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>